summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Pavlik <rpavlik@iastate.edu>2012-01-05 20:57:53 +0000
committerJulien Danjou <julien@danjou.info>2012-01-11 18:03:31 +0100
commit0e9246def562be97cc816f824f702233a826ec56 (patch)
tree6f3d18a0d802b922b4b19aba2f8be4e6801c410d
parent4aa7a2c849a9536febb2dc7773e06c12a69c5213 (diff)
Fix include order with Xdmcp on WIN32
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@dronecode.org.uk> Reviewed-by: Peter Harris <pharris@opentext.com> Signed-off-by: Julien Danjou <julien@danjou.info>
-rw-r--r--src/xcb_auth.c7
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