diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-09 10:39:43 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-09 10:39:43 +0100 |
| commit | f7eb7329c8efe023b304d5e66b08d1a998973220 (patch) | |
| tree | 290de7865db558d7c85ba03e735e4a135ae69aab /libxcb | |
| parent | ceca11a64938e803d2e0d8ccfc030357c3a0121c (diff) | |
| parent | d483a0007d3a25fbf565436f655fa45b4265628a (diff) | |
| download | vcxsrv-f7eb7329c8efe023b304d5e66b08d1a998973220.tar.gz vcxsrv-f7eb7329c8efe023b304d5e66b08d1a998973220.tar.bz2 vcxsrv-f7eb7329c8efe023b304d5e66b08d1a998973220.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/xcb_in.c
Diffstat (limited to 'libxcb')
| -rw-r--r-- | libxcb/src/xcb_in.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/libxcb/src/xcb_in.c b/libxcb/src/xcb_in.c index c6a405e62..d7db8235e 100644 --- a/libxcb/src/xcb_in.c +++ b/libxcb/src/xcb_in.c @@ -51,16 +51,6 @@ #define XCB_REPLY 1 #define XCB_XGE_EVENT 35 -#ifdef _MSC_VER -#ifdef MSG_WAITALL -#undef MSG_WAITALL -#endif -#endif - -/* required for compiling for Win32 using MinGW */ -#ifndef MSG_WAITALL -#define MSG_WAITALL 0 -#endif struct event_list { xcb_generic_event_t *event; @@ -275,7 +265,7 @@ static int read_block(const int fd, void *buf, const ssize_t len) int done = 0; while(done < len) { - int ret = recv(fd, ((char *) buf) + done, len - done,MSG_WAITALL); + int ret = recv(fd, ((char *) buf) + done, len - done, 0); if(ret > 0) done += ret; #ifndef _WIN32 @@ -667,7 +657,7 @@ void _xcb_in_replies_done(xcb_connection_t *c) int _xcb_in_read(xcb_connection_t *c) { - int n = recv(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len,MSG_WAITALL); + int n = recv(c->fd, c->in.queue + c->in.queue_len, sizeof(c->in.queue) - c->in.queue_len, 0); if(n > 0) c->in.queue_len += n; while(read_packet(c)) |