Update to xproto 7.0.26

7 files changed, 90 insertions, 6 deletions

diff --git a/proto/x11proto/ChangeLog b/proto/x11proto/ChangeLog
index 68d12ef34..9cca11aa0 100644
--- a/proto/x11proto/ChangeLog
+++ b/proto/x11proto/ChangeLog
@@ -1,3 +1,67 @@
+commit 03cbbf6c3e811c026c86e3a60d2f9af56606e155
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Mon Apr 14 15:36:00 2014 +0200
+
+    xproto 7.0.26
+    
+    Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit d522ff998b77f0c8c39c4d3945f78d2221fe1209
+Author: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date:   Tue Dec 17 14:26:07 2013 +0000
+
+    Xpoll.h.in: Fix WIN32 check to trigger on MinGW only
+    
+    MinGW-w64 w32api-headers 3.0.0 define WIN32 in some places they didn't before,
+    which causes this check to turn on for Cygwin, which is not wanted.
+    
+    Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+    Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+
+commit aee7e4de57349db186ca9d8c1312dc18590d3942
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date:   Wed Apr 3 13:55:16 2013 +0100
+
+    Xwindows.h: Wrap Windows 64-bit types as well for 64-bit build
+    
+    Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+    Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+
+commit e5e2ed5b115107d1b1d5248ac5c5dda67e71ea50
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sat Dec 28 11:11:00 2013 -0800
+
+    Add more comments on connection setup to Xproto.h
+    
+    Some of the bits I forget and have to dig out of the protocol spec
+    every few years when I need to know again.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 148d89f0b3a652acc54b1a21807ffd6d0e81e279
+Author: Keith Packard <keithp@keithp.com>
+Date:   Sun Dec 15 08:27:09 2013 -0800
+
+    Replace 'pointer' with explicit 'void *'
+    
+    To get rid of the 'pointer' typedef, stop using it locally. That way,
+    when _XTYPEDEF_POINTER is defined before Xdefs.h is included, it won't
+    get defined and Xdefs.h will still compile.
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3911ad9e8e8911c4b4a5d624e73b51667d0e3963
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date:   Thu Nov 21 20:20:22 2013 -0600
+
+    Xthreads.h: Declare _Xthread_init for WIN32
+    
+    This fixes the build of libXt on *-*-mingw* with -Werror=implicit.
+    
+    Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
 commit a7fa86998c873ce7463d169b4bd423898ca2bae1
 Author: Alan Coopersmith <alan.coopersmith@oracle.com>
 Date:   Fri Nov 22 22:14:24 2013 -0800
diff --git a/proto/x11proto/Xdefs.h b/proto/x11proto/Xdefs.h
index 46ffdad88..e25a20821 100644
--- a/proto/x11proto/Xdefs.h
+++ b/proto/x11proto/Xdefs.h
@@ -101,8 +101,8 @@ typedef FSID AccContext;
 typedef struct timeval **OSTimePtr;
 
 
-typedef void (* BlockHandlerProcPtr)(pointer /* blockData */,
+typedef void (* BlockHandlerProcPtr)(void * /* blockData */,
 				     OSTimePtr /* pTimeout */,
-				     pointer /* pReadmask */);
+				     void * /* pReadmask */);
 
 #endif
diff --git a/proto/x11proto/Xpoll.h.in b/proto/x11proto/Xpoll.h.in
index 827565809..0a0542420 100644
--- a/proto/x11proto/Xpoll.h.in
+++ b/proto/x11proto/Xpoll.h.in
@@ -50,7 +50,7 @@ from The Open Group.
 #ifndef _XPOLL_H_
 #define _XPOLL_H_
 
-#ifndef WIN32
+#if !defined(WIN32) || defined(__CYGWIN__)
 
 #ifndef USE_POLL
 
diff --git a/proto/x11proto/Xproto.h b/proto/x11proto/Xproto.h
index 76e2c9972..6cdea89cd 100644
--- a/proto/x11proto/Xproto.h
+++ b/proto/x11proto/Xproto.h
@@ -259,10 +259,13 @@ restoring the definitions in X.h.  */
 typedef CARD16 KeyButMask;
 
 /***************** 
-   connection setup structure.  This is followed by
-   numRoots xWindowRoot structs.
+   Connection setup structures.  See Chapter 8: Connection Setup
+   of the X Window System Protocol specification for details.
 *****************/
 
+/* Client initiates handshake with this data, followed by the strings
+ * for the auth protocol & data.
+ */
 typedef struct {
     CARD8	byteOrder;
     BYTE	pad;
@@ -272,6 +275,16 @@ typedef struct {
     CARD16	pad2 B16;
 } xConnClientPrefix;
 
+/* Server response to xConnClientPrefix.
+ *
+ * If success == Success, this is followed by xConnSetup and
+ * numRoots xWindowRoot structs.
+ *
+ * If success == Failure, this is followed by a reason string.
+ *
+ * The protocol also defines a case of success == Authenticate, but
+ * that doesn't seem to have ever been implemented by the X Consortium.
+ */
 typedef struct {
     CARD8          success;
     BYTE           lengthReason; /*num bytes in string following if failure */
diff --git a/proto/x11proto/Xthreads.h b/proto/x11proto/Xthreads.h
index 3d4420825..2027127eb 100644
--- a/proto/x11proto/Xthreads.h
+++ b/proto/x11proto/Xthreads.h
@@ -107,6 +107,7 @@ typedef struct {
     struct _xthread_waiter *waiters;
 } xcondition_rec;
 typedef CRITICAL_SECTION xmutex_rec;
+extern void _Xthread_init(void);
 #    define xthread_init() _Xthread_init()
 #    define xthread_self GetCurrentThreadId
 #    define xthread_fork(func,closure) { \
diff --git a/proto/x11proto/Xwindows.h b/proto/x11proto/Xwindows.h
index e6be6eef2..70e1debd5 100644
--- a/proto/x11proto/Xwindows.h
+++ b/proto/x11proto/Xwindows.h
@@ -63,6 +63,10 @@ The Open Group.
 #define _NO_BOOL_TYPEDEF
 #define BOOL WINBOOL
 #define INT32 wINT32
+#ifdef __x86_64__
+#define INT64 wINT64
+#define LONG64 wLONG64
+#endif
 #undef Status
 #define Status wStatus
 #define ATOM wATOM
@@ -75,6 +79,8 @@ The Open Group.
 #undef BYTE
 #undef BOOL
 #undef INT32
+#undef INT64
+#undef LONG64
 #undef ATOM
 #undef FreeResource
 #undef CreateWindowA
diff --git a/proto/x11proto/configure.ac b/proto/x11proto/configure.ac
index 04f123827..355fd0b35 100644
--- a/proto/x11proto/configure.ac
+++ b/proto/x11proto/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([Xproto], [7.0.25],
+AC_INIT([Xproto], [7.0.26],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])