From c7a181e449c6a2ea5f0ad0514865e7c559dbe6dc Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 30 Jan 2012 08:52:35 +0100
Subject: libxcb mesa git update 30 jan 2012

---
 libxcb/src/xcb_auth.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'libxcb/src')

diff --git a/libxcb/src/xcb_auth.c b/libxcb/src/xcb_auth.c
index ea4ad8f6a..a5b730c0c 100644
--- a/libxcb/src/xcb_auth.c
+++ b/libxcb/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
-- 
cgit v1.2.3