projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove arbitrary division between xcb_types and xproto by merging
[free-sw/xcb/libxcb]
/
src
/
xcb.h
diff --git
a/src/xcb.h
b/src/xcb.h
index
c7084ff
..
ca58e3d
100644
(file)
--- a/
src/xcb.h
+++ b/
src/xcb.h
@@
-25,8
+25,8
@@
* authorization from the authors.
*/
* authorization from the authors.
*/
-#ifndef __XCB_H
-#define __XCB_H
+#ifndef __XCB_H
__
+#define __XCB_H
__
#include <sys/types.h>
/* TODO: check for stdint in config? (HAVE_STDINT) fallback? */
#include <sys/types.h>
/* TODO: check for stdint in config? (HAVE_STDINT) fallback? */
@@
-48,10
+48,12
@@
typedef int32_t INT32;
#include <sys/uio.h>
#include <pthread.h>
#include <sys/uio.h>
#include <pthread.h>
+
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
extern "C" {
#endif
+
#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
#define deprecated __attribute__((__deprecated__))
#else
#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
#define deprecated __attribute__((__deprecated__))
#else
@@
-154,8
+156,7
@@
typedef struct {
} XCBVoidCookie;
} XCBVoidCookie;
-/* Include the generated xproto and xcb_types headers. */
-#include "xcb_types.h"
+/* Include the generated xproto header. */
#include "xproto.h"
#include "xproto.h"
@@
-534,4
+535,5
@@
XCBGenericIter XCBConnSetupSuccessRepEnd(XCBSetupIter i) deprecated;
}
#endif
}
#endif
-#endif
+
+#endif /* __XCB_H__ */