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 402b042..439b885 100644 (file)
--- a/src/xcbint.h
+++ b/src/xcbint.h
@@ -28,15 +28,9 @@
 #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,
@@ -76,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);