X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcbint.h;h=34b7197473fe852028a5c6c8d5f5528f1fefffe3;hb=bae98d36040d0cda1862839410cf92bac3927280;hp=eb90fc36628c7dbf7727d7f7b7eb898ae9f6228c;hpb=6149c7a6b57a193bc132fbc35b1772b75e5c7ca7;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcbint.h b/src/xcbint.h
index eb90fc3..34b7197 100644
--- a/src/xcbint.h
+++ b/src/xcbint.h
@@ -28,21 +28,17 @@
 #ifndef __XCBINT_H
 #define __XCBINT_H
 
-/* Not simply (a <= b) because eventually the 32-bit sequence number
- * will wrap, causing earlier sequence numbers to be higher than later
- * ones for a brief but fatal period. (a and b must be unsigned.) */
-#define _xcb_assert_sequence_less(a,b) assert((b) - (a) < 65536)
-
-#define _xcb_assert_valid_sequence(c) do { \
-    _xcb_assert_sequence_less((c)->in.request_read, (c)->out.request_written); \
-    _xcb_assert_sequence_less((c)->out.request_written, (c)->out.request); \
-} while(0)
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 enum workarounds {
     WORKAROUND_NONE,
     WORKAROUND_GLX_GET_FB_CONFIGS_BUG
 };
 
+#define XCB_PAD(i) (-(i) & 3)
+
 /* xcb_list.c */
 
 typedef struct _xcb_list _xcb_list;
@@ -74,20 +70,6 @@ void *_xcb_map_get(_xcb_map *q, unsigned int key);
 void *_xcb_map_remove(_xcb_map *q, unsigned int key);
 
 
-/* xcb_util.c */
-
-/* Index of nearest 4-byte boundary following E. */
-#define XCB_CEIL(E) (((E)+3)&~3)
-
-#define XCB_PAD(i) ((4 - (i & 3)) & 3)
-
-int _xcb_set_fd_flags(const int fd);
-int _xcb_readn(const int fd, void *buf, const int buflen, int *count);
-int _xcb_read_block(const int fd, void *buf, const size_t len);
-int _xcb_write(const int fd, char (*buf)[], int *count);
-int _xcb_writev(const int fd, struct iovec *vec, int count);
-
-
 /* xcb_out.c */
 
 typedef struct _xcb_out {