[Xcb] [PATCH 2/3] Fix include order with Xdmcp on WIN32

Jon TURNEY jon.turney at dronecode.org.uk
Thu Jan 5 12:57:53 PST 2012


From: Ryan Pavlik <rpavlik at iastate.edu>

Fix a redefinition problem due to include order which shows up when
building for _WIN32 and libXdmcp is installed, so HASXDMAUTH is enabled

Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
---
 src/xcb_auth.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/xcb_auth.c b/src/xcb_auth.c
index 21c26b8..ea4ad8f 100644
--- a/src/xcb_auth.c
+++ b/src/xcb_auth.c
@@ -36,6 +36,10 @@
 #include <rpc/types.h>
 #endif
 
+#ifdef HASXDMAUTH
+#include <X11/Xdmcp.h>
+#endif
+
 #ifdef _WIN32
 #include "xcb_windefs.h"
 #else
@@ -48,9 +52,6 @@
 #include "xcb.h"
 #include "xcbint.h"
 
-#ifdef HASXDMAUTH
-#include <X11/Xdmcp.h>
-#endif
 
 enum auth_protos {
 #ifdef HASXDMAUTH
-- 
1.7.5.1



More information about the Xcb mailing list