We do not conflict with Xmd.h anymore; remove the include hack from xcb_auth.c
This commit is contained in:
parent
4ff12a1a94
commit
86a4c0cc28
|
@ -34,21 +34,13 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
/* FIXME: for the moment Xdmcp.h must be included before xcb.h because
|
#include "xcb.h"
|
||||||
* it includes Xmd.h, but config.h (normally included from xcbint.h
|
#include "xcbint.h"
|
||||||
* which must be included after xcb.h) must be included before Xdmcp.h.
|
|
||||||
* Ow. */
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
#include "config.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HASXDMAUTH
|
#ifdef HASXDMAUTH
|
||||||
#include <X11/Xdmcp.h>
|
#include <X11/Xdmcp.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "xcb.h"
|
|
||||||
#include "xcbint.h"
|
|
||||||
|
|
||||||
enum auth_protos {
|
enum auth_protos {
|
||||||
#ifdef HASXDMAUTH
|
#ifdef HASXDMAUTH
|
||||||
AUTH_XA1,
|
AUTH_XA1,
|
||||||
|
|
Loading…
Reference in New Issue