allow inclusion of Xproto.h by renaming their BOOL to XPROTO_BOOL

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1369 423420c4-83ab-492f-b58f-81f9feb106b5

xwin.c

@@ -20,6 +20,9 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#define BOOL XPROTO_BOOL
+#include <X11/Xproto.h>
+#undef BOOL
 #include <unistd.h>
 #include <sys/time.h>
 #include <time.h>
@@ -28,9 +31,6 @@
 #include "rdesktop.h"
 #include "xproto.h"
 
-/* We can't include Xproto.h because of conflicting defines for BOOL */
-#define X_ConfigureWindow              12
-
 extern int g_width;
 extern int g_height;
 extern int g_xpos;