hw/xwin: Undefine _XSERVER64 in hw/xwin/winclipboard

Including any server header might define the macro _XSERVER64 on 64 bit
machines. That macro must _NOT_ be defined for Xlib client code, otherwise bad
things happen. So let's undef that macro if necessary.

Remove server directories from include path to ensure no server includes are
included

Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
Reviewed-by: Colin Harrison <colin.harrison@virgin.net>

hw/xwin/winclipboard/Makefile.am

@@ -9,8 +9,7 @@ libXWinclipboard_la_SOURCES = \
 
 libXWinclipboard_la_CFLAGS = -DHAVE_XWIN_CONFIG_H \
 			     $(DIX_CFLAGS) \
-			     $(XWINMODULES_CFLAGS) \
-		             -I$(top_srcdir) -I$(top_srcdir)/miext/rootless -I$(srcdir)/..
+			     $(XWINMODULES_CFLAGS)
 
 libXWinclipboard_la_LDFLAGS = -static -no-undefined
 

hw/xwin/winclipboard/textconv.c

@@ -31,6 +31,16 @@
 #ifdef HAVE_XWIN_CONFIG_H
 #include <xwin-config.h>
 #endif
+
+/*
+ * Including any server header might define the macro _XSERVER64 on 64 bit machines.
+ * That macro must _NOT_ be defined for Xlib client code, otherwise bad things happen.
+ * So let's undef that macro if necessary.
+ */
+#ifdef _XSERVER64
+#undef _XSERVER64
+#endif
+
 #include <stdlib.h>
 #include "internal.h"
 

hw/xwin/winclipboard/thread.c

@@ -36,6 +36,15 @@
 #define HAS_WINSOCK 1
 #endif
 
+/*
+ * Including any server header might define the macro _XSERVER64 on 64 bit machines.
+ * That macro must _NOT_ be defined for Xlib client code, otherwise bad things happen.
+ * So let's undef that macro if necessary.
+ */
+#ifdef _XSERVER64
+#undef _XSERVER64
+#endif
+
 #include <assert.h>
 #include <unistd.h>
 #include <fcntl.h>

hw/xwin/winclipboard/wndproc.c

@@ -34,6 +34,15 @@
 #include <xwin-config.h>
 #endif
 
+/*
+ * Including any server header might define the macro _XSERVER64 on 64 bit machines.
+ * That macro must _NOT_ be defined for Xlib client code, otherwise bad things happen.
+ * So let's undef that macro if necessary.
+ */
+#ifdef _XSERVER64
+#undef _XSERVER64
+#endif
+
 #include <sys/types.h>
 #include <sys/time.h>
 

hw/xwin/winclipboard/xevents.c

@@ -34,6 +34,15 @@
 #include <xwin-config.h>
 #endif
 
+/*
+ * Including any server header might define the macro _XSERVER64 on 64 bit machines.
+ * That macro must _NOT_ be defined for Xlib client code, otherwise bad things happen.
+ * So let's undef that macro if necessary.
+ */
+#ifdef _XSERVER64
+#undef _XSERVER64
+#endif
+
 #include "internal.h"
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>

hw/xwin/winclipboard/xwinclip.c

@@ -35,6 +35,15 @@
 #include <xwin-config.h>
 #endif
 
+/*
+ * Including any server header might define the macro _XSERVER64 on 64 bit machines.
+ * That macro must _NOT_ be defined for Xlib client code, otherwise bad things happen.
+ * So let's undef that macro if necessary.
+ */
+#ifdef _XSERVER64
+#undef _XSERVER64
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>