Update to x11proto 7.0.29

4 files changed, 58 insertions, 7 deletions

diff --git a/proto/x11proto/ChangeLog b/proto/x11proto/ChangeLog
index bf88f47a6..82c66ed60 100644
--- a/proto/x11proto/ChangeLog
+++ b/proto/x11proto/ChangeLog
@@ -1,3 +1,51 @@
+commit 3e975a39b002070d245d21838f837aaf6e5c41d0
+Author: Julien Cristau <jcristau@debian.org>
+Date:   Fri May 13 10:28:12 2016 +0200
+
+    xproto 7.0.29
+    
+    Signed-off-by: Julien Cristau <jcristau@debian.org>
+
+commit de30673937e2d36b84cf50c3eb05bbf9836fabfb
+Author: James Clarke <jrtc27@jrtc27.com>
+Date:   Mon Apr 25 17:12:08 2016 +0100
+
+    Don't let XFD_SETSIZE exceed FD_SETSIZE
+    
+    This fixes 2c94cdb453bc641246cc8b9a876da9799bee1ce7 on the Hurd, as
+    FD_SETSIZE is only 256, and so anyone using XFD_SETSIZE to iterate over
+    the contents of an fd_set will overrun the array.
+    
+    Signed-off-by: James Clarke <jrtc27@jrtc27.com>
+    Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit edc04f87c74abacb57782dc947f81a2810a72537
+Author: Olivier Fourdan <ofourdan@redhat.com>
+Date:   Wed Aug 26 10:11:11 2015 +0200
+
+    Raise the number of FD on WIN32 as well
+    
+    Commit 2c94cdb raised the number of file descriptors from 256 to 512
+    but only for non-WIN32 platforms.
+    
+    The definition of XFD_SETSIZE being duplicated, we need to do the same
+    for WIN32 builds as well otherwise a newer X server trying to
+    use more than 256 clients would fail on that platform.
+    
+    Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+    Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+
+commit 446ee4b7f7ce1bb75f0f6b23bbb33d4bfe8d7ad3
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Sun Jul 26 08:38:54 2015 -0700
+
+    Incorrect guard block in HPkeysym.h
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=91469
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: Thomas Klausner <wiz@NetBSD.org>
+
 commit d5524e2b8d811aa03ed19c6e8fb2ee4162ca2b23
 Author: Adam Jackson <ajax@redhat.com>
 Date:   Wed Jul 1 11:35:13 2015 -0400
diff --git a/proto/x11proto/HPkeysym.h b/proto/x11proto/HPkeysym.h
index ed000b167..4a0655a23 100644
--- a/proto/x11proto/HPkeysym.h
+++ b/proto/x11proto/HPkeysym.h
@@ -57,7 +57,7 @@ performance, or use of this material.
 
 #ifndef _HPKEYSYM_H
 
-#define _HPKEYSYM
+#define _HPKEYSYM_H
 
 #define hpXK_ClearLine		0x1000FF6F
 #define hpXK_InsertLine		0x1000FF70
diff --git a/proto/x11proto/Xpoll.h.in b/proto/x11proto/Xpoll.h.in
index 01be164a9..9f127e106 100644
--- a/proto/x11proto/Xpoll.h.in
+++ b/proto/x11proto/Xpoll.h.in
@@ -67,10 +67,13 @@ typedef long fd_mask;
 # endif
 #endif
 
-#define XFD_SETSIZE	512
-
-#ifndef FD_SETSIZE
-#define FD_SETSIZE	XFD_SETSIZE
+#if defined(FD_SETSIZE) && FD_SETSIZE < 512
+# define XFD_SETSIZE	FD_SETSIZE
+#else
+# define XFD_SETSIZE	512
+# ifndef FD_SETSIZE
+#  define FD_SETSIZE	XFD_SETSIZE
+# endif
 #endif
 
 #ifndef NBBY
@@ -165,7 +168,7 @@ typedef struct fd_set {
 
 #else /* WIN32 */
 
-#define XFD_SETSIZE	256
+#define XFD_SETSIZE	512
 #ifndef FD_SETSIZE
 #define FD_SETSIZE	XFD_SETSIZE
 #endif
diff --git a/proto/x11proto/configure.ac b/proto/x11proto/configure.ac
index 562b5a5dc..bc6409aa9 100644
--- a/proto/x11proto/configure.ac
+++ b/proto/x11proto/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([Xproto], [7.0.28],
+AC_INIT([Xproto], [7.0.29],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])