From 838317f4d305e07f35ddd99e2ebccfa8fac680c6 Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Fri, 24 Feb 2006 01:17:03 -0800 Subject: [PATCH] Remove XCB_CEIL and use a simpler definition for XCB_PAD. --- src/xcb_out.c | 2 +- src/xcbint.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/xcb_out.c b/src/xcb_out.c index 89c7618..a6b0350 100644 --- a/src/xcb_out.c +++ b/src/xcb_out.c @@ -137,7 +137,7 @@ int XCBSendRequest(XCBConnection *c, unsigned int *request, struct iovec *vector /* put together the length field, possibly using BIGREQUESTS */ for(i = 0; i < req->count; ++i) - longlen += XCB_CEIL(vector[i].iov_len) >> 2; + longlen += (vector[i].iov_len + 3) >> 2; if(longlen > c->setup->maximum_request_length) { diff --git a/src/xcbint.h b/src/xcbint.h index 1d7b873..439b885 100644 --- a/src/xcbint.h +++ b/src/xcbint.h @@ -70,10 +70,7 @@ 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_read_block(const int fd, void *buf, const size_t len); -- 2.7.4