frederik
/
libxcb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The typedefs replacing Xmd.h conflict with Xmd.h. Here is a hacky workaround: FIXME!

This commit is contained in:
Jamey Sharp 2006-03-16 11:27:06 -08:00
parent 5ccf7216d2
commit df5d8adc1f
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/xcb.h
View File

@ -32,6 +32,8 @@
/* TODO: check for stdint in config? (HAVE_STDINT) fallback? */
#include <stdint.h>
/* FIXME: these names conflict with those defined in Xmd.h. */
#ifndef XMD_H
typedef uint8_t BYTE;
typedef uint8_t BOOL;
typedef uint8_t CARD8;
@ -40,6 +42,7 @@ typedef uint32_t CARD32;
typedef int8_t INT8;
typedef int16_t INT16;
typedef int32_t INT32;
#endif /* XMD_H */
#include <X11/X.h>
#include <sys/uio.h>

12
src/xcb_auth.c
View File

@ -34,13 +34,21 @@
#include <unistd.h>
#include <stdlib.h>
#include "xcb.h"
#include "xcbint.h"
/* FIXME: for the moment Xdmcp.h must be included before xcb.h because
* it includes Xmd.h, but config.h (normally included from 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
#include <X11/Xdmcp.h>
#endif
#include "xcb.h"
#include "xcbint.h"
enum auth_protos {
#ifdef HASXDMAUTH
AUTH_XA1,