[Xcb] [PATCH] Revert "Fix include order with Xdmcp on WIN32"

Jeremy Huddleston jeremyhu at freedesktop.org
Tue Jan 17 23:55:23 PST 2012

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 at apple.com>


libxcb started failing to build in yuffie tinderbox just before the 1.8 release.  This is fallout from 0e9246def562be97cc816f824f702233a826ec56 which essentially just causes <X11/Xdmcp.h> to never be included under any cicrumstances.

This is a perfect example of why it's not a good idea to tag without waiting a few days.  I suspect there should be a 1.8.1 brownbag which fixes this failure and the xcb-proto dependency bug.

I don't know what you were trying to fix with this commit, since I don't have access to Windows, but this was not the right fix.

 src/xcb_auth.c |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

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>
-#include <X11/Xdmcp.h>
 #ifdef _WIN32
 #include "xcb_windefs.h"
@@ -52,6 +48,9 @@
 #include "xcb.h"
 #include "xcbint.h"
+#include <X11/Xdmcp.h>
 enum auth_protos {

More information about the Xcb mailing list