Module Name:    xsrc
Committed By:   mrg
Date:           Wed Mar 14 06:43:46 UTC 2018

Modified Files:
        xsrc/external/mit/libxcb/dist/src: xcb_in.c
        xsrc/external/mit/libxcb/include: config.h
Removed Files:
        xsrc/external/mit/libxcb/dist: compile config.guess config.sub depcomp
            install-sh ltmain.sh missing

Log Message:
merge libxcb 1.13.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libxcb/dist/compile
cvs rdiff -u -r1.1.1.5 -r0 xsrc/external/mit/libxcb/dist/config.guess \
    xsrc/external/mit/libxcb/dist/config.sub
cvs rdiff -u -r1.1.1.4 -r0 xsrc/external/mit/libxcb/dist/depcomp \
    xsrc/external/mit/libxcb/dist/ltmain.sh
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libxcb/dist/install-sh \
    xsrc/external/mit/libxcb/dist/missing
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libxcb/dist/src/xcb_in.c
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libxcb/include/config.h

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.5 xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.6
--- xsrc/external/mit/libxcb/dist/src/xcb_in.c:1.5	Tue Oct  4 22:01:49 2016
+++ xsrc/external/mit/libxcb/dist/src/xcb_in.c	Wed Mar 14 06:43:45 2018
@@ -661,6 +661,8 @@ int xcb_poll_for_reply(xcb_connection_t 
     assert(reply != 0);
     pthread_mutex_lock(&c->iolock);
     ret = poll_for_reply(c, widen(c, request), reply, error);
+    if(!ret && c->in.reading == 0 && _xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */
+        ret = poll_for_reply(c, widen(c, request), reply, error);
     pthread_mutex_unlock(&c->iolock);
     return ret;
 }
@@ -678,6 +680,8 @@ int xcb_poll_for_reply64(xcb_connection_
     assert(reply != 0);
     pthread_mutex_lock(&c->iolock);
     ret = poll_for_reply(c, request, reply, error);
+    if(!ret && c->in.reading == 0 && _xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */
+        ret = poll_for_reply(c, request, reply, error);
     pthread_mutex_unlock(&c->iolock);
     return ret;
 }
@@ -768,6 +772,8 @@ xcb_generic_event_t *xcb_poll_for_specia
         return 0;
     pthread_mutex_lock(&c->iolock);
     event = get_special_event(c, se);
+    if(!event && c->in.reading == 0 && _xcb_in_read(c)) /* _xcb_in_read shuts down the connection on error */
+        event = get_special_event(c, se);
     pthread_mutex_unlock(&c->iolock);
     return event;
 }

Index: xsrc/external/mit/libxcb/include/config.h
diff -u xsrc/external/mit/libxcb/include/config.h:1.7 xsrc/external/mit/libxcb/include/config.h:1.8
--- xsrc/external/mit/libxcb/include/config.h:1.7	Sun Mar  5 08:58:25 2017
+++ xsrc/external/mit/libxcb/include/config.h	Wed Mar 14 06:43:45 2018
@@ -75,7 +75,7 @@
 #define PACKAGE_NAME "libxcb"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "libxcb 1.12"
+#define PACKAGE_STRING "libxcb 1.13"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "libxcb"
@@ -84,13 +84,13 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.12"
+#define PACKAGE_VERSION "1.13"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 1
 
 /* Minor version of this package */
-#define PACKAGE_VERSION_MINOR 12
+#define PACKAGE_VERSION_MINOR 13
 
 /* Patch version of this package */
 #define PACKAGE_VERSION_PATCHLEVEL 0
@@ -124,7 +124,7 @@
 
 
 /* Version number of package */
-#define VERSION "1.12"
+#define VERSION "1.13"
 
 /* XCB buffer queue size */
 #define XCB_QUEUE_BUFFER_SIZE 16384

Reply via email to