HPkeysym.h | 2 +-
Xfuncproto.h.in | 3 +++
Xfuncs.h | 2 +-
Xos.h | 2 +-
Xpoll.h.in | 24 ++++++++++++++++++------
configure.ac | 2 +-
6 files changed, 25 insertions(+), 10 deletions(-)
New commits:
commit 3e975a39b002070d245d21838f837aaf6e5c41d0
Author: Julien Cristau <jcris...@debian.org>
Date: Fri May 13 10:28:12 2016 +0200
xproto 7.0.29
Signed-off-by: Julien Cristau <jcris...@debian.org>
diff --git a/configure.ac b/configure.ac
index 562b5a5..bc6409a 100644
--- a/configure.ac
+++ b/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])
commit de30673937e2d36b84cf50c3eb05bbf9836fabfb
Author: James Clarke <jrt...@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 <jrt...@jrtc27.com>
Reviewed-by: Julien Cristau <jcris...@debian.org>
diff --git a/Xpoll.h.in b/Xpoll.h.in
index 2878591..9f127e1 100644
--- a/Xpoll.h.in
+++ b/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
commit edc04f87c74abacb57782dc947f81a2810a72537
Author: Olivier Fourdan <ofour...@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 <ofour...@redhat.com>
Reviewed-by: Jon TURNEY <jon.tur...@dronecode.org.uk>
diff --git a/Xpoll.h.in b/Xpoll.h.in
index 01be164..2878591 100644
--- a/Xpoll.h.in
+++ b/Xpoll.h.in
@@ -165,7 +165,7 @@ typedef struct fd_set {
#else /* WIN32 */
-#define XFD_SETSIZE 256
+#define XFD_SETSIZE 512
#ifndef FD_SETSIZE
#define FD_SETSIZE XFD_SETSIZE
#endif
commit 446ee4b7f7ce1bb75f0f6b23bbb33d4bfe8d7ad3
Author: Alan Coopersmith <alan.coopersm...@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.coopersm...@oracle.com>
Reviewed-by: Thomas Klausner <w...@netbsd.org>
diff --git a/HPkeysym.h b/HPkeysym.h
index ed000b1..4a0655a 100644
--- a/HPkeysym.h
+++ b/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
commit d5524e2b8d811aa03ed19c6e8fb2ee4162ca2b23
Author: Adam Jackson <a...@redhat.com>
Date: Wed Jul 1 11:35:13 2015 -0400
xproto 7.0.28
Signed-off-by: Adam Jackson <a...@redhat.com>
diff --git a/configure.ac b/configure.ac
index 1709862..562b5a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([Xproto], [7.0.27],
+AC_INIT([Xproto], [7.0.28],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7
Author: Olivier Fourdan <ofour...@redhat.com>
Date: Fri May 29 18:16:34 2015 +0200
Increase the number of file descriptors
To allow up to 512 clients, the number of file descriptors being
monitored need to be increased accordingly.
Signed-off-by: Adam Jackson <a...@redhat.com>
Signed-off-by: Olivier Fourdan <ofour...@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/Xpoll.h.in b/Xpoll.h.in
index 0a05424..01be164 100644
--- a/Xpoll.h.in
+++ b/Xpoll.h.in
@@ -67,7 +67,7 @@ typedef long fd_mask;
# endif
#endif
-#define XFD_SETSIZE 256
+#define XFD_SETSIZE 512
#ifndef FD_SETSIZE
#define FD_SETSIZE XFD_SETSIZE
@@ -127,7 +127,16 @@ typedef struct fd_set {
(howmany(FD_SETSIZE, NFDBITS) > 4 && (__XFDS_BITS(p, 4))) || \
(howmany(FD_SETSIZE, NFDBITS) > 5 && (__XFDS_BITS(p, 5))) || \
(howmany(FD_SETSIZE, NFDBITS) > 6 && (__XFDS_BITS(p, 6))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 7 && (__XFDS_BITS(p, 7))))
+ (howmany(FD_SETSIZE, NFDBITS) > 7 && (__XFDS_BITS(p, 7))) || \
+ (howmany(FD_SETSIZE, NFDBITS) > 8 && (__XFDS_BITS(p, 8))) || \
+ (howmany(FD_SETSIZE, NFDBITS) > 9 && (__XFDS_BITS(p, 9))) || \
+ (howmany(FD_SETSIZE, NFDBITS) > 10 && (__XFDS_BITS(p, 10))) || \
+ (howmany(FD_SETSIZE, NFDBITS) > 11 && (__XFDS_BITS(p, 11))) || \
+ (howmany(FD_SETSIZE, NFDBITS) > 12 && (__XFDS_BITS(p, 12))) || \
+ (howmany(FD_SETSIZE, NFDBITS) > 13 && (__XFDS_BITS(p, 13))) || \
+ (howmany(FD_SETSIZE, NFDBITS) > 14 && (__XFDS_BITS(p, 14))) || \
+ (howmany(FD_SETSIZE, NFDBITS) > 15 && (__XFDS_BITS(p, 15))))
+
#define XFD_COPYSET(src,dst) { \
int __i__; \
commit 2dc2c38fb530c717b1944c93a889e4deff61b7f9
Author: Jeremy Huddleston Sequoia <jerem...@apple.com>
Date: Mon May 25 04:30:29 2015 -0700
darwin: Include strings.h
https://trac.macports.org/ticket/47813
Signed-off-by: Jeremy Huddleston Sequoia <jerem...@apple.com>
diff --git a/Xfuncs.h b/Xfuncs.h
index 469bb48..b7c4029 100644
--- a/Xfuncs.h
+++ b/Xfuncs.h
@@ -44,7 +44,7 @@ void bcopy();
# define bcmp(b1,b2,len) memcmp(b1, b2, len)
# else
# include <string.h>
-# if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__) ||
defined(__CYGWIN__) || defined(_AIX)
+# if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__) ||
defined(__CYGWIN__) || defined(_AIX) || defined(__APPLE__)
# include <strings.h>
# endif
# define _XFUNCS_H_INCLUDED_STRING_H
diff --git a/Xos.h b/Xos.h
index 7e53946..28dfc67 100644
--- a/Xos.h
+++ b/Xos.h
@@ -60,7 +60,7 @@ in this Software without prior written authorization from The
Open Group.
*/
# include <string.h>
-# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) ||
defined(__CYGWIN__) || defined(_AIX)
+# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) ||
defined(__CYGWIN__) || defined(_AIX) || defined(__APPLE__)
# include <strings.h>
# else
# ifndef index
commit 70cf8acf06705097b009a488994b526832b0ef66
Author: Thomas Klausner <w...@netbsd.org>
Date: Sun Jan 11 00:39:14 2015 +0100
Use C99 compliant definition of nonnull attribute.
Fixes warning with clang.
Signed-off-by: Thomas Klausner <w...@netbsd.org>
Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/Xfuncproto.h.in b/Xfuncproto.h.in
index e9e5e71..5daa83e 100644
--- a/Xfuncproto.h.in
+++ b/Xfuncproto.h.in
@@ -152,6 +152,9 @@ in this Software without prior written authorization from
The Open Group.
argument macros, must be only used inside #ifdef _X_NONNULL guards, as
many legacy X clients are compiled in C89 mode still. */
#if __has_attribute(nonnull) \
+ && defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
+#define _X_NONNULL(...) __attribute__((nonnull(__VA_ARGS__)))
+#elif __has_attribute(nonnull) \
|| defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
#define _X_NONNULL(args...) __attribute__((nonnull(args)))
#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
