aboutsummaryrefslogtreecommitdiff
path: root/libxcb/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-01-30 08:57:33 +0100
committermarha <marha@users.sourceforge.net>2012-01-30 08:57:33 +0100
commitf774f1e0c95bae5beed78051aaae4fe35b44bf0a (patch)
tree9ac7a63464d084e5cb519db91f15dd3389ce3c44 /libxcb/src
parenteec00dde378e1f1ec72c886e809f693e103e77c8 (diff)
parentc7a181e449c6a2ea5f0ad0514865e7c559dbe6dc (diff)
downloadvcxsrv-f774f1e0c95bae5beed78051aaae4fe35b44bf0a.tar.gz
vcxsrv-f774f1e0c95bae5beed78051aaae4fe35b44bf0a.tar.bz2
vcxsrv-f774f1e0c95bae5beed78051aaae4fe35b44bf0a.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'libxcb/src')
-rw-r--r--libxcb/src/xcb_auth.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/libxcb/src/xcb_auth.c b/libxcb/src/xcb_auth.c
index eaf463cb2..0514a77e7 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