X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_auth.c;h=a5b730c0ca79a08686e6aeaca7fd3808600414f6;hb=cca607409068ad0948e7283fb8d0465cabc51686;hp=ea4ad8f6ad205e89fa3b0431595b6a445ce9a9a9;hpb=0e9246def562be97cc816f824f702233a826ec56;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcb_auth.c b/src/xcb_auth.c
index ea4ad8f..a5b730c 100644
--- a/src/xcb_auth.c
+++ b/src/xcb_auth.c
@@ -25,6 +25,10 @@
 
 /* Authorization systems for the X protocol. */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <assert.h>
 #include <X11/Xauth.h>
 #include <sys/param.h>
@@ -36,11 +40,12 @@
 #include <rpc/types.h>
 #endif
 
+#ifdef _WIN32
 #ifdef HASXDMAUTH
-#include <X11/Xdmcp.h>
+/* We must include the wrapped windows.h before any system header which includes
+   it unwrapped, to avoid conflicts with types defined in X headers */
+#include <X11/Xwindows.h>
 #endif
-
-#ifdef _WIN32
 #include "xcb_windefs.h"
 #else
 #include <arpa/inet.h>
@@ -52,6 +57,9 @@
 #include "xcb.h"
 #include "xcbint.h"
 
+#ifdef HASXDMAUTH
+#include <X11/Xdmcp.h>
+#endif
 
 enum auth_protos {
 #ifdef HASXDMAUTH