X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcbint.h;h=e8e98eba9687f2dbbf5a0fe25976a6d476c35b6c;hb=a1eff0c49a2dbb328a79edbeb2b851fa1dfe9e61;hp=ebbb2fea300b7ba882a8672dbda2508be9ed19b2;hpb=3f8d0bd5322749132626e8f203017b6da6448fd0;p=free-sw%2Fxcb%2Flibxcb

diff --git a/src/xcbint.h b/src/xcbint.h
index ebbb2fe..e8e98eb 100644
--- a/src/xcbint.h
+++ b/src/xcbint.h
@@ -28,11 +28,17 @@
 #ifndef __XCBINT_H
 #define __XCBINT_H
 
+#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;
@@ -64,17 +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_read_block(const int fd, void *buf, const size_t len);
-
-
 /* xcb_out.c */
 
 typedef struct _xcb_out {
@@ -147,7 +142,8 @@ void _xcb_xid_destroy(XCBConnection *c);
 
 typedef struct _xcb_ext {
     pthread_mutex_t lock;
-    _xcb_map *extensions;
+    struct lazyreply *extensions;
+    int extensions_size;
 } _xcb_ext;
 
 int _xcb_ext_init(XCBConnection *c);