projects
/
free-sw
/
xcb
/
libxcb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changes to makefile to build libXCBxtest
[free-sw/xcb/libxcb]
/
src
/
xcb.h
diff --git
a/src/xcb.h
b/src/xcb.h
index
9920c85
..
d4d02b4
100644
(file)
--- a/
src/xcb.h
+++ b/
src/xcb.h
@@
-32,6
+32,8
@@
/* TODO: check for stdint in config? (HAVE_STDINT) fallback? */
#include <stdint.h>
/* 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;
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;
typedef int8_t INT8;
typedef int16_t INT16;
typedef int32_t INT32;
+#endif /* XMD_H */
#include <X11/X.h>
#include <sys/uio.h>
#include <X11/X.h>
#include <sys/uio.h>
@@
-84,6
+87,8
@@
extern "C" {
/** XCBNone is the universal null resource or null atom parameter value for many core X requests */
#define XCBNone 0L
/** XCBNone is the universal null resource or null atom parameter value for many core X requests */
#define XCBNone 0L
+/** XCBCopyFromParent can be used for many CreateWindow parameters */
+#define XCBCopyFromParent 0L
/* Opaque structures */
/* Opaque structures */
@@
-268,9
+273,10
@@
XCBGenericEvent *XCBPollForEvent(XCBConnection *c, int *error);
* processed. This function enables applications to determine whether
* forcing a cookie is going to block.
*
* processed. This function enables applications to determine whether
* forcing a cookie is going to block.
*
- * @todo review that function.
+ * @deprecated This function is deprecated in favor of XCBPollForReply.
+ * It must not be used in newly written code.
*/
*/
-unsigned int XCBGetRequestRead(XCBConnection *c);
+unsigned int XCBGetRequestRead(XCBConnection *c)
deprecated
;
/* xcb_ext.c */
/* xcb_ext.c */