X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fxcb_in.c;h=ad870c1746745d3c6ed113cf0ef4a143a0138e7b;hb=c4e40f646b8da4fd112ea54a612c880be5e942a8;hp=95087be4e3a20adc38cc3421c672f05e9c7b1e08;hpb=a1299eb2a210b5788a2b827b82a3d825caa1f201;p=free-sw%2Fxcb%2Flibxcb diff --git a/src/xcb_in.c b/src/xcb_in.c index 95087be..ad870c1 100644 --- a/src/xcb_in.c +++ b/src/xcb_in.c @@ -36,9 +36,6 @@ #include #include -#include "xcb.h" -#include "xcbext.h" -#include "xcbint.h" #if USE_POLL #include #endif @@ -51,6 +48,10 @@ #include "xcb_windefs.h" #endif /* _WIN32 */ +#include "xcb.h" +#include "xcbext.h" +#include "xcbint.h" + #define XCB_ERROR 0 #define XCB_REPLY 1 #define XCB_XGE_EVENT 35 @@ -200,9 +201,9 @@ static int read_packet(xcb_connection_t *c) c->in.request_completed = c->in.request_read - 1; } - while(c->in.pending_replies && + while(c->in.pending_replies && c->in.pending_replies->workaround != WORKAROUND_EXTERNAL_SOCKET_OWNER && - XCB_SEQUENCE_COMPARE (c->in.pending_replies->last_request, <=, c->in.request_completed)) + XCB_SEQUENCE_COMPARE (c->in.pending_replies->last_request, <=, c->in.request_completed)) { pending_reply *oldpend = c->in.pending_replies; c->in.pending_replies = oldpend->next; @@ -386,11 +387,11 @@ static int read_block(const int fd, void *buf, const ssize_t len) FD_ZERO(&fds); FD_SET(fd, &fds); - /* Initializing errno here makes sure that for Win32 this loop will execute only once */ - errno = 0; - do { - ret = select(fd + 1, &fds, 0, 0, 0); - } while (ret == -1 && errno == EINTR); + /* Initializing errno here makes sure that for Win32 this loop will execute only once */ + errno = 0; + do { + ret = select(fd + 1, &fds, 0, 0, 0); + } while (ret == -1 && errno == EINTR); #endif /* USE_POLL */ } if(ret <= 0) @@ -746,7 +747,7 @@ xcb_register_for_special_xge(xcb_connection_t *c, pthread_mutex_unlock(&c->iolock); return NULL; } - + se->extension = ext_reply->major_opcode; se->eid = eid;