summaryrefslogtreecommitdiff
path: root/src/lib/ecore_x
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2016-05-09 16:58:31 -0700
committerCedric BAIL <cedric@osg.samsung.com>2016-05-09 16:58:53 -0700
commit0c4880e99dd047dc92abb0ea6a04febb91908aef (patch)
tree344c45c691bef20ac2d8b388174c757aa431ac7e /src/lib/ecore_x
parentd00643fcc4ebe2de3d9abf21edd0a7f55d99972c (diff)
efl: everyone should now rely on Eina MIN/MAX redefinition.
Diffstat (limited to 'src/lib/ecore_x')
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_dnd.c4
-rw-r--r--src/lib/ecore_x/xcb/ecore_xcb_private.h8
2 files changed, 0 insertions, 12 deletions
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_dnd.c b/src/lib/ecore_x/xcb/ecore_xcb_dnd.c
index 07eae1f22a..974ec0e4b2 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_dnd.c
+++ b/src/lib/ecore_x/xcb/ecore_xcb_dnd.c
@@ -1,9 +1,5 @@
1#include "ecore_xcb_private.h" 1#include "ecore_xcb_private.h"
2 2
3#ifndef MIN
4# define MIN(a, b) (((a) < (b)) ? (a) : (b))
5#endif
6
7/* local structures */ 3/* local structures */
8typedef struct _Version_Cache_Item 4typedef struct _Version_Cache_Item
9{ 5{
diff --git a/src/lib/ecore_x/xcb/ecore_xcb_private.h b/src/lib/ecore_x/xcb/ecore_xcb_private.h
index 61452f2385..d6bb743934 100644
--- a/src/lib/ecore_x/xcb/ecore_xcb_private.h
+++ b/src/lib/ecore_x/xcb/ecore_xcb_private.h
@@ -73,14 +73,6 @@ extern int _ecore_xcb_log_dom;
73# define MAXHOSTNAMELEN 256 73# define MAXHOSTNAMELEN 256
74# endif 74# endif
75 75
76# ifndef MIN
77# define MIN(x, y) (((x) > (y)) ? (y) : (x))
78# endif
79
80# ifndef MAX
81# define MAX(a, b) ((a < b) ? b : a)
82# endif
83
84#define CHECK_XCB_CONN \ 76#define CHECK_XCB_CONN \
85 { \ 77 { \
86 if (xcb_connection_has_error(_ecore_xcb_conn)) \ 78 if (xcb_connection_has_error(_ecore_xcb_conn)) \