Update to x11proto 7.0.28

This commit is contained in:
matthieu 2016-01-03 10:32:58 +00:00
parent 8b6c7dfac5
commit 04055c9a99
7 changed files with 60 additions and 6 deletions

View File

@ -1,3 +1,45 @@
commit d5524e2b8d811aa03ed19c6e8fb2ee4162ca2b23
Author: Adam Jackson <ajax@redhat.com>
Date: Wed Jul 1 11:35:13 2015 -0400
xproto 7.0.28
Signed-off-by: Adam Jackson <ajax@redhat.com>
commit 2c94cdb453bc641246cc8b9a876da9799bee1ce7
Author: Olivier Fourdan <ofourdan@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 <ajax@redhat.com>
Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 2dc2c38fb530c717b1944c93a889e4deff61b7f9
Author: Jeremy Huddleston Sequoia <jeremyhu@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 <jeremyhu@apple.com>
commit 70cf8acf06705097b009a488994b526832b0ef66
Author: Thomas Klausner <wiz@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 <wiz@NetBSD.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 303b137a55bb2d092b008439570a323c89a41d70 commit 303b137a55bb2d092b008439570a323c89a41d70
Author: Alan Coopersmith <alan.coopersmith@oracle.com> Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Dec 30 21:15:09 2014 -0800 Date: Tue Dec 30 21:15:09 2014 -0800

View File

@ -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 argument macros, must be only used inside #ifdef _X_NONNULL guards, as
many legacy X clients are compiled in C89 mode still. */ many legacy X clients are compiled in C89 mode still. */
#if __has_attribute(nonnull) \ #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) || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
#define _X_NONNULL(args...) __attribute__((nonnull(args))) #define _X_NONNULL(args...) __attribute__((nonnull(args)))
#elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */ #elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */

View File

@ -44,7 +44,7 @@ void bcopy();
# define bcmp(b1,b2,len) memcmp(b1, b2, len) # define bcmp(b1,b2,len) memcmp(b1, b2, len)
# else # else
# include <string.h> # 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> # include <strings.h>
# endif # endif
# define _XFUNCS_H_INCLUDED_STRING_H # define _XFUNCS_H_INCLUDED_STRING_H

View File

@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group.
*/ */
# include <string.h> # 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> # include <strings.h>
# else # else
# ifndef index # ifndef index

View File

@ -67,7 +67,7 @@ typedef long fd_mask;
# endif # endif
#endif #endif
#define XFD_SETSIZE 256 #define XFD_SETSIZE 512
#ifndef FD_SETSIZE #ifndef FD_SETSIZE
#define FD_SETSIZE XFD_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) > 4 && (__XFDS_BITS(p, 4))) || \
(howmany(FD_SETSIZE, NFDBITS) > 5 && (__XFDS_BITS(p, 5))) || \ (howmany(FD_SETSIZE, NFDBITS) > 5 && (__XFDS_BITS(p, 5))) || \
(howmany(FD_SETSIZE, NFDBITS) > 6 && (__XFDS_BITS(p, 6))) || \ (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) { \ #define XFD_COPYSET(src,dst) { \
int __i__; \ int __i__; \

View File

@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC scriptversion=2012-10-14.11; # UTC
# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>. # Written by Tom Tromey <tromey@cygnus.com>.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify

View File

@ -1,5 +1,5 @@
AC_PREREQ([2.60]) 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]) [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_INIT_AUTOMAKE([foreign dist-bzip2])