devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=11d250e5fc1ca1a580260683f918cc36849921af
commit 11d250e5fc1ca1a580260683f918cc36849921af
Author: Chris Michael <cp.mich...@samsung.com>
Date: Wed Mar 12 08:38:00 2014 +0000
ecore-x: Predefine Ecore_X_Atom and Ecore_X_Icon
@fix: Fix building Enlightenment without X support
These changes are needed so that we can build Enlightenment without X
support. Many places in the E code reference
Ecore_X_Atom/Ecore_X_Icon. If we build E without X support, these end
up being undefined, causing build to fail, so we need to predefine them.
Signed-off-by: Chris Michael <cp.mich...@samsung.com>
---
src/lib/ecore_x/Ecore_X.h | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index 0d04279..da973c9 100644
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -77,6 +77,12 @@ typedef unsigned int Ecore_X_ID;
#ifndef _ECORE_X_WINDOW_PREDEF
typedef Ecore_X_ID Ecore_X_Window;
typedef Ecore_X_ID Ecore_X_Pixmap;
+typedef Ecore_X_ID Ecore_X_Atom;
+typedef struct _Ecore_X_Icon
+{
+ unsigned int width, height;
+ unsigned int *data;
+} Ecore_X_Icon;
#endif // ifndef _ECORE_X_WINDOW_PREDEF
typedef void *Ecore_X_Visual;
typedef Ecore_X_ID Ecore_X_Drawable;
@@ -85,7 +91,6 @@ typedef Ecore_X_ID Ecore_X_GC;
#else // ifdef HAVE_ECORE_X_XCB
typedef void *Ecore_X_GC;
#endif /* HAVE_ECORE_X_XCB */
-typedef Ecore_X_ID Ecore_X_Atom;
typedef Ecore_X_ID Ecore_X_Colormap;
typedef Ecore_X_ID Ecore_X_Time;
typedef Ecore_X_ID Ecore_X_Cursor;
@@ -115,12 +120,6 @@ typedef struct _Ecore_X_Rectangle
unsigned int width, height;
} Ecore_X_Rectangle;
-typedef struct _Ecore_X_Icon
-{
- unsigned int width, height;
- unsigned int *data;
-} Ecore_X_Icon;
-
typedef enum _Ecore_X_GC_Value_Mask
{
ECORE_X_GC_VALUE_MASK_FUNCTION = (1L << 0),
--
