Module Name: xsrc
Committed By: wiz
Date: Sun Jul 26 22:13:33 UTC 2015
Modified Files:
xsrc/external/mit/libxcb/dist/src: xcb_in.c
Log Message:
Reduce diffs to upstream.
Probably merge issue, mostly whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libxcb/dist/src/xcb_in.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libxcb/dist/src/xcb_in.c
diff -u xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.3 xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.4
--- xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.3 Mon Mar 17 03:08:52 2014
+++ xsrc/external/mit/libxcb/dist/src/xcb_in.c Sun Jul 26 22:13:33 2015
@@ -36,9 +36,6 @@
#include <stdio.h>
#include <errno.h>
-#include "xcb.h"
-#include "xcbext.h"
-#include "xcbint.h"
#if USE_POLL
#include <poll.h>
#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->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
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_connect
pthread_mutex_unlock(&c->iolock);
return NULL;
}
-
+
se->extension = ext_reply->major_opcode;
se->eid = eid;
