Module Name: xsrc
Committed By: mrg
Date: Sun Nov 1 11:08:41 UTC 2020
Modified Files:
xsrc/external/mit/libxcb/dist/src: xcb_in.c
Removed Files:
xsrc/external/mit/libxcb/dist: README
xsrc/external/mit/xcb-proto/dist: README
Log Message:
merge libxcb and xcb-proto 1.14.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libxcb/dist/README
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libxcb/dist/src/xcb_in.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xcb-proto/dist/README
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.7 xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.8
--- xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.7 Fri Dec 28 22:16:48 2018
+++ xsrc/external/mit/libxcb/dist/src/xcb_in.c Sun Nov 1 11:08:40 2020
@@ -1025,6 +1025,7 @@ int _xcb_in_read(xcb_connection_t *c)
}
}
#endif
+ c->in.total_read += n;
c->in.queue_len += n;
}
while(read_packet(c))
@@ -1051,7 +1052,7 @@ int _xcb_in_read(xcb_connection_t *c)
}
#endif
#ifndef _WIN32
- if((n > 0) || (n < 0 && errno == EAGAIN))
+ if((n > 0) || (n < 0 && (errno == EAGAIN || errno == EINTR)))
#else
if((n > 0) || (n < 0 && WSAGetLastError() == WSAEWOULDBLOCK))
#endif /* !_WIN32 */
