diff options
| author | Jeremy Huddleston <jeremyhu@freedesktop.org> | 2012-01-17 23:55:23 -0800 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2012-01-28 12:44:06 -0800 |
| commit | 6db1a2686f0f073438d36f5fa0f97b787842b0f2 (patch) | |
| tree | c5fa116ec38d2470b8f983780db0b23da69032a8 | |
| parent | da1d15082baab844a3b9b2d5cc48620af0b806ec (diff) | |
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>
| -rw-r--r-- | 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> #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 |