From b7f155654ae2c5b8e91f06f3a8542ef588efefd2 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 28 Dec 2015 22:32:52 +0100 Subject: pointer typedef in Xdefs.h: also catch Xdefs.h include in include/misc.h, make undoing the FIXME more obvious. --- nx-X11/programs/Xserver/include/misc.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'nx-X11/programs/Xserver/include/misc.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 #ifndef IN_MODULE -- cgit v1.2.3