From a810d1ffe4825b9359f13ebb395f5f681961fc89 Mon Sep 17 00:00:00 2001 From: Ian Osgood Date: Mon, 13 Mar 2006 17:49:17 -0800 Subject: [PATCH] Remove dependencies on Xmd.h and X.h (Still including X.h until defs are moved to xproto.xml and xcb-util and xcb-demo are fixed to use them.) --- src/xcb.h | 14 +++++++++++++- src/xcb_auth.c | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/xcb.h b/src/xcb.h index 68c32a8..18785ab 100644 --- a/src/xcb.h +++ b/src/xcb.h @@ -28,7 +28,19 @@ #ifndef __XCB_H #define __XCB_H #include -#include + +/* TODO: check for stdint in config? (HAVE_STDINT) fallback? */ +#include + +typedef uint8_t BYTE; +typedef uint8_t BOOL; +typedef uint8_t CARD8; +typedef uint16_t CARD16; +typedef uint32_t CARD32; +typedef int8_t INT8; +typedef int16_t INT16; +typedef int32_t INT32; + #include #include #include diff --git a/src/xcb_auth.c b/src/xcb_auth.c index 3971010..d72d780 100644 --- a/src/xcb_auth.c +++ b/src/xcb_auth.c @@ -97,7 +97,7 @@ static Xauth *get_authptr(struct sockaddr *sockname, unsigned int socknamelen) addr = (char *) &si->sin_addr; addrlen = 4; if (ntohl(si->sin_addr.s_addr) != 0x7f000001) - family = FamilyInternet; /* 0 */ + family = 0; /* X.h: FamilyInternet */ snprintf(dispbuf, sizeof(dispbuf), "%d", ntohs(si->sin_port) - X_TCP_PORT); display = dispbuf; } -- 2.34.1