CVS commit: xsrc/external/mit/libxcb/dist/src
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;
CVS commit: xsrc/external/mit/libxcb/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 11:35:44 UTC 2010 Update of /cvsroot/xsrc/external/mit/libxcb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv15795 Log Message: initial import of libxcb-1.7 Status: Vendor Tag: xorg Release Tags: libxcb-1-7 U xsrc/external/mit/libxcb/dist/xcb-dri2.pc.in U xsrc/external/mit/libxcb/dist/configure.ac U xsrc/external/mit/libxcb/dist/xcb-composite.pc.in U xsrc/external/mit/libxcb/dist/xcb-xprint.pc.in U xsrc/external/mit/libxcb/dist/xcb-damage.pc.in U xsrc/external/mit/libxcb/dist/xcb-xfixes.pc.in U xsrc/external/mit/libxcb/dist/Makefile.in U xsrc/external/mit/libxcb/dist/configure U xsrc/external/mit/libxcb/dist/NEWS U xsrc/external/mit/libxcb/dist/xcb-sync.pc.in U xsrc/external/mit/libxcb/dist/autogen.sh U xsrc/external/mit/libxcb/dist/xcb-xselinux.pc.in U xsrc/external/mit/libxcb/dist/xcb-randr.pc.in U xsrc/external/mit/libxcb/dist/xcb-screensaver.pc.in U xsrc/external/mit/libxcb/dist/xcb-xevie.pc.in U xsrc/external/mit/libxcb/dist/xcb.pc.in U xsrc/external/mit/libxcb/dist/xcb-render.pc.in U xsrc/external/mit/libxcb/dist/xcb-xinerama.pc.in U xsrc/external/mit/libxcb/dist/xcb-res.pc.in U xsrc/external/mit/libxcb/dist/xcb-record.pc.in U xsrc/external/mit/libxcb/dist/xcb-shape.pc.in U xsrc/external/mit/libxcb/dist/xcb-glx.pc.in U xsrc/external/mit/libxcb/dist/missing U xsrc/external/mit/libxcb/dist/xcb-xtest.pc.in U xsrc/external/mit/libxcb/dist/depcomp U xsrc/external/mit/libxcb/dist/xcb-xinput.pc.in U xsrc/external/mit/libxcb/dist/README U xsrc/external/mit/libxcb/dist/INSTALL U xsrc/external/mit/libxcb/dist/config.guess U xsrc/external/mit/libxcb/dist/xcb-xv.pc.in U xsrc/external/mit/libxcb/dist/COPYING U xsrc/external/mit/libxcb/dist/aclocal.m4 U xsrc/external/mit/libxcb/dist/Makefile.am U xsrc/external/mit/libxcb/dist/ltmain.sh U xsrc/external/mit/libxcb/dist/acinclude.m4 U xsrc/external/mit/libxcb/dist/xcb-xf86dri.pc.in U xsrc/external/mit/libxcb/dist/xcb-dpms.pc.in U xsrc/external/mit/libxcb/dist/xcb-shm.pc.in U xsrc/external/mit/libxcb/dist/xcb-xvmc.pc.in U xsrc/external/mit/libxcb/dist/config.sub U xsrc/external/mit/libxcb/dist/install-sh U xsrc/external/mit/libxcb/dist/tools/constants U xsrc/external/mit/libxcb/dist/tools/README U xsrc/external/mit/libxcb/dist/tools/api_conv.pl U xsrc/external/mit/libxcb/dist/src/xcb_list.c U xsrc/external/mit/libxcb/dist/src/xcb_in.c U xsrc/external/mit/libxcb/dist/src/Makefile.in U xsrc/external/mit/libxcb/dist/src/xcb_auth.c U xsrc/external/mit/libxcb/dist/src/xcb_ext.c U xsrc/external/mit/libxcb/dist/src/c_client.py U xsrc/external/mit/libxcb/dist/src/xcbint.h U xsrc/external/mit/libxcb/dist/src/xcb_conn.c U xsrc/external/mit/libxcb/dist/src/xcb_util.c U xsrc/external/mit/libxcb/dist/src/xcb_out.c U xsrc/external/mit/libxcb/dist/src/xcb.h U xsrc/external/mit/libxcb/dist/src/xcbext.h U xsrc/external/mit/libxcb/dist/src/Makefile.am U xsrc/external/mit/libxcb/dist/src/config.h.in U xsrc/external/mit/libxcb/dist/src/xcb_xid.c U xsrc/external/mit/libxcb/dist/tests/check_public.c U xsrc/external/mit/libxcb/dist/tests/Makefile.in U xsrc/external/mit/libxcb/dist/tests/CheckLog.xsl U xsrc/external/mit/libxcb/dist/tests/check_all.c U xsrc/external/mit/libxcb/dist/tests/check_suites.h U xsrc/external/mit/libxcb/dist/tests/Makefile.am U xsrc/external/mit/libxcb/dist/doc/Makefile.in U xsrc/external/mit/libxcb/dist/doc/xcb.doxygen.in U xsrc/external/mit/libxcb/dist/doc/Makefile.am U xsrc/external/mit/libxcb/dist/doc/tutorial/index.html U xsrc/external/mit/libxcb/dist/doc/tutorial/xcb.css No conflicts created by this import
CVS commit: xsrc/external/mit/libxcb/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 17 20:37:18 UTC 2010 Update of /cvsroot/xsrc/external/mit/libxcb/dist In directory ivanova.netbsd.org:/tmp/cvs-serv14186 Log Message: initial import of libxcb-1.6 Status: Vendor Tag: xorg Release Tags: libxcb-1-6 N xsrc/external/mit/libxcb/dist/xcb-dri2.pc.in N xsrc/external/mit/libxcb/dist/configure.ac N xsrc/external/mit/libxcb/dist/xcb-composite.pc.in N xsrc/external/mit/libxcb/dist/xcb-xprint.pc.in N xsrc/external/mit/libxcb/dist/xcb-damage.pc.in N xsrc/external/mit/libxcb/dist/xcb-xfixes.pc.in N xsrc/external/mit/libxcb/dist/Makefile.in N xsrc/external/mit/libxcb/dist/configure N xsrc/external/mit/libxcb/dist/NEWS N xsrc/external/mit/libxcb/dist/xcb-sync.pc.in N xsrc/external/mit/libxcb/dist/autogen.sh N xsrc/external/mit/libxcb/dist/xcb-xselinux.pc.in N xsrc/external/mit/libxcb/dist/xcb-randr.pc.in N xsrc/external/mit/libxcb/dist/xcb-screensaver.pc.in N xsrc/external/mit/libxcb/dist/xcb-xevie.pc.in N xsrc/external/mit/libxcb/dist/xcb.pc.in N xsrc/external/mit/libxcb/dist/xcb-render.pc.in N xsrc/external/mit/libxcb/dist/xcb-xinerama.pc.in N xsrc/external/mit/libxcb/dist/xcb-res.pc.in N xsrc/external/mit/libxcb/dist/xcb-record.pc.in N xsrc/external/mit/libxcb/dist/xcb-shape.pc.in N xsrc/external/mit/libxcb/dist/xcb-glx.pc.in N xsrc/external/mit/libxcb/dist/missing N xsrc/external/mit/libxcb/dist/xcb-xtest.pc.in N xsrc/external/mit/libxcb/dist/depcomp N xsrc/external/mit/libxcb/dist/xcb-xinput.pc.in N xsrc/external/mit/libxcb/dist/README N xsrc/external/mit/libxcb/dist/INSTALL N xsrc/external/mit/libxcb/dist/config.guess N xsrc/external/mit/libxcb/dist/xcb-xv.pc.in N xsrc/external/mit/libxcb/dist/COPYING N xsrc/external/mit/libxcb/dist/aclocal.m4 N xsrc/external/mit/libxcb/dist/Makefile.am N xsrc/external/mit/libxcb/dist/ltmain.sh N xsrc/external/mit/libxcb/dist/acinclude.m4 N xsrc/external/mit/libxcb/dist/xcb-xf86dri.pc.in N xsrc/external/mit/libxcb/dist/xcb-dpms.pc.in N xsrc/external/mit/libxcb/dist/xcb-shm.pc.in N xsrc/external/mit/libxcb/dist/xcb-xvmc.pc.in N xsrc/external/mit/libxcb/dist/config.sub N xsrc/external/mit/libxcb/dist/install-sh N xsrc/external/mit/libxcb/dist/tools/constants N xsrc/external/mit/libxcb/dist/tools/README N xsrc/external/mit/libxcb/dist/tools/api_conv.pl N xsrc/external/mit/libxcb/dist/src/xcb_list.c N xsrc/external/mit/libxcb/dist/src/xcb_in.c N xsrc/external/mit/libxcb/dist/src/Makefile.in N xsrc/external/mit/libxcb/dist/src/xcb_auth.c N xsrc/external/mit/libxcb/dist/src/xcb_ext.c N xsrc/external/mit/libxcb/dist/src/c_client.py N xsrc/external/mit/libxcb/dist/src/xcbint.h N xsrc/external/mit/libxcb/dist/src/xcb_conn.c N xsrc/external/mit/libxcb/dist/src/xcb_util.c N xsrc/external/mit/libxcb/dist/src/xcb_out.c N xsrc/external/mit/libxcb/dist/src/xcb.h N xsrc/external/mit/libxcb/dist/src/xcbext.h N xsrc/external/mit/libxcb/dist/src/Makefile.am N xsrc/external/mit/libxcb/dist/src/config.h.in N xsrc/external/mit/libxcb/dist/src/xcb_xid.c N xsrc/external/mit/libxcb/dist/tests/check_public.c N xsrc/external/mit/libxcb/dist/tests/Makefile.in N xsrc/external/mit/libxcb/dist/tests/CheckLog.xsl N xsrc/external/mit/libxcb/dist/tests/check_all.c N xsrc/external/mit/libxcb/dist/tests/check_suites.h N xsrc/external/mit/libxcb/dist/tests/Makefile.am N xsrc/external/mit/libxcb/dist/doc/Makefile.in N xsrc/external/mit/libxcb/dist/doc/xcb.doxygen.in N xsrc/external/mit/libxcb/dist/doc/Makefile.am N xsrc/external/mit/libxcb/dist/doc/tutorial/index.html N xsrc/external/mit/libxcb/dist/doc/tutorial/xcb.css No conflicts created by this import
