summaryrefslogtreecommitdiff
path: root/src/lib/ecore_x/Ecore_X.h
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-07-08 17:14:30 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-07-08 17:15:11 +0900
commit9e459ef9d620532dd45e0cc07a53e7216df48690 (patch)
treebecda3e78c9443b41012bc375666247c8f5fc660 /src/lib/ecore_x/Ecore_X.h
parentb8e16b8f4a30dd5cce1fda1f57fae023c7e2228f (diff)
fix new ecore_x_pixmap typedef clashes in ecore_x
Diffstat (limited to 'src/lib/ecore_x/Ecore_X.h')
-rw-r--r--src/lib/ecore_x/Ecore_X.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/ecore_x/Ecore_X.h b/src/lib/ecore_x/Ecore_X.h
index 8aac0e996c..ca7766444f 100644
--- a/src/lib/ecore_x/Ecore_X.h
+++ b/src/lib/ecore_x/Ecore_X.h
@@ -59,9 +59,9 @@
59typedef unsigned int Ecore_X_ID; 59typedef unsigned int Ecore_X_ID;
60#ifndef _ECORE_X_WINDOW_PREDEF 60#ifndef _ECORE_X_WINDOW_PREDEF
61typedef Ecore_X_ID Ecore_X_Window; 61typedef Ecore_X_ID Ecore_X_Window;
62typedef Ecore_X_ID Ecore_X_Pixmap;
62#endif // ifndef _ECORE_X_WINDOW_PREDEF 63#endif // ifndef _ECORE_X_WINDOW_PREDEF
63typedef void *Ecore_X_Visual; 64typedef void *Ecore_X_Visual;
64typedef Ecore_X_ID Ecore_X_Pixmap;
65typedef Ecore_X_ID Ecore_X_Drawable; 65typedef Ecore_X_ID Ecore_X_Drawable;
66#ifdef HAVE_ECORE_X_XCB 66#ifdef HAVE_ECORE_X_XCB
67typedef Ecore_X_ID Ecore_X_GC; 67typedef Ecore_X_ID Ecore_X_GC;