From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Wed, 18 Jan 2012 07:55:23 +0000 (-0800)
Subject: Revert "Fix include order with Xdmcp on WIN32"
X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6db1a2686f0f073438d36f5fa0f97b787842b0f2;hp=da1d15082baab844a3b9b2d5cc48620af0b806ec;p=free-sw%2Fxcb%2Flibxcb

Revert "Fix include order with Xdmcp on WIN32"

This reverts commit 0e9246def562be97cc816f824f702233a826ec56.

This change caused build failures because <X11/Xdmcp.h> was never
included under any circumstance.  This is because the check for
HASXDMAUTH was moved before the inclusion of config.h (via xcbint.h)
which defined it.

Found-by: Tinderbox
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
---

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