Merge remote-tracking branch 'origin/released'

Conflicts:
	libxcb/src/xcb_in.c

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))