Revert "Fix include order with Xdmcp on WIN32"
This reverts commit 0e9246def5
.
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>
This commit is contained in:
parent
da1d15082b
commit
6db1a2686f
|
@ -36,10 +36,6 @@
|
||||||
#include <rpc/types.h>
|
#include <rpc/types.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HASXDMAUTH
|
|
||||||
#include <X11/Xdmcp.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
#include "xcb_windefs.h"
|
#include "xcb_windefs.h"
|
||||||
#else
|
#else
|
||||||
|
@ -52,6 +48,9 @@
|
||||||
#include "xcb.h"
|
#include "xcb.h"
|
||||||
#include "xcbint.h"
|
#include "xcbint.h"
|
||||||
|
|
||||||
|
#ifdef HASXDMAUTH
|
||||||
|
#include <X11/Xdmcp.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
enum auth_protos {
|
enum auth_protos {
|
||||||
#ifdef HASXDMAUTH
|
#ifdef HASXDMAUTH
|
||||||
|
|
Loading…
Reference in New Issue