X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcbint.h;h=1d7b87378a0b11a43b4b8a1f8ad79025cda7ee6f;hb=1b50d2ee1ef532429674126eace88ac73d51ec23;hp=9cb0c30fcb0abb9794ef5cee83f266e9c46b6a65;hpb=5b7182c659391160239467f1041a1d755db45bd3;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcbint.h b/src/xcbint.h index 9cb0c30..1d7b873 100644 --- 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, @@ -82,10 +76,7 @@ void *_xcb_map_remove(_xcb_map *q, unsigned int key); #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 */ @@ -99,7 +90,6 @@ typedef struct _xcb_out { struct iovec *vec; int vec_len; - void *last_request; unsigned int request; unsigned int request_written; @@ -139,7 +129,6 @@ void _xcb_in_destroy(_xcb_in *in); int _xcb_in_expect_reply(XCBConnection *c, unsigned int request, enum workarounds workaround); -int _xcb_in_read_packet(XCBConnection *c); int _xcb_in_read(XCBConnection *c); int _xcb_in_read_block(XCBConnection *c, void *buf, int nread);