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>
This commit is contained in:
parent
4aa7a2c849
commit
0e9246def5
|
@ -36,6 +36,10 @@
|
||||||
#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
|
||||||
|
@ -48,9 +52,6 @@
|
||||||
#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