aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 22:32:52 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-28 22:32:52 +0100
commitb7f155654ae2c5b8e91f06f3a8542ef588efefd2 (patch)
tree07cdc6ab2388d34161727243155f50ad84bdfea1 /nx-X11/programs
parent7eab400aba5966cbc5f4837a3f32d381de5c9759 (diff)
downloadnx-libs-b7f155654ae2c5b8e91f06f3a8542ef588efefd2.tar.gz
nx-libs-b7f155654ae2c5b8e91f06f3a8542ef588efefd2.tar.bz2
nx-libs-b7f155654ae2c5b8e91f06f3a8542ef588efefd2.zip
pointer typedef in Xdefs.h: also catch Xdefs.h include in include/misc.h, make undoing the FIXME more obvious.
Diffstat (limited to 'nx-X11/programs')
-rw-r--r--nx-X11/programs/Xserver/include/gc.h14
-rw-r--r--nx-X11/programs/Xserver/include/misc.h9
2 files changed, 17 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/include/gc.h b/nx-X11/programs/Xserver/include/gc.h
index acac5e3e8..0465071a3 100644
--- a/nx-X11/programs/Xserver/include/gc.h
+++ b/nx-X11/programs/Xserver/include/gc.h
@@ -52,16 +52,18 @@ SOFTWARE.
#include <nx-X11/X.h> /* for GContext, Mask */
+#ifndef _XTYPEDEF_POINTER
+/* Don't let Xdefs.h define 'pointer' */
+#define _XTYPEDEF_POINTER 1
+#endif /* _XTYPEDEF_POINTER */
+
/* FIXME: for building this code against Xlib versions older than apprx. 04/2014
* we still have to define the pointer type via Xdefs.h.
*
* The nx-libs code itself does not require the pointer definition.
- *
-#ifndef _XTYPEDEF_POINTER
-// Don't let Xdefs.h define 'pointer'
-#define _XTYPEDEF_POINTER 1
-#endif // _XTYPEDEF_POINTER
-*/
+ */
+#undef _XTYPEDEF_POINTER
+
#include <nx-X11/Xdefs.h> /* for Bool */
#include <nx-X11/Xproto.h>
diff --git a/nx-X11/programs/Xserver/include/misc.h b/nx-X11/programs/Xserver/include/misc.h
index cb3051c94..e6bc1019d 100644
--- a/nx-X11/programs/Xserver/include/misc.h
+++ b/nx-X11/programs/Xserver/include/misc.h
@@ -86,6 +86,15 @@ extern unsigned long serverGeneration;
/* Don't let Xdefs.h define 'pointer' */
#define _XTYPEDEF_POINTER 1
#endif /* _XTYPEDEF_POINTER */
+
+/* FIXME: for building this code against Xlib versions older than apprx. 04/2014
+ * we still have to define the pointer type via Xdefs.h.
+ *
+ * The nx-libs code itself does not require the pointer definition.
+ *
+ */
+#undef _XTYPEDEF_POINTER
+
#include <nx-X11/Xdefs.h>
#ifndef IN_MODULE