Remove XCB_CEIL and use a simpler definition for XCB_PAD.

[free-sw/xcb/libxcb] / src / xcbint.h

diff --git a/src/xcbint.h b/src/xcbint.h
index e7e6688..439b885 100644 (file)
--- a/src/xcbint.h
+++ b/src/xcbint.h
@@ -28,6 +28,10 @@
 #ifndef __XCBINT_H
 #define __XCBINT_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 enum workarounds {
     WORKAROUND_NONE,
     WORKAROUND_GLX_GET_FB_CONFIGS_BUG
@@ -66,13 +70,9 @@ 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)
+#define XCB_PAD(i) (-(i) & 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);