Update to x11proto 7.0.27

6 files changed, 89 insertions, 36 deletions

diff --git a/proto/x11proto/ChangeLog b/proto/x11proto/ChangeLog
index 9cca11aa0..f7daa9c10 100644
--- a/proto/x11proto/ChangeLog
+++ b/proto/x11proto/ChangeLog
@@ -1,3 +1,58 @@
+commit 303b137a55bb2d092b008439570a323c89a41d70
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Tue Dec 30 21:15:09 2014 -0800
+
+    xproto 7.0.27
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ffd4a13042d24cb5c913207585191801a9a1603e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri Jul 18 17:08:25 2014 -0700
+
+    Use clang's __has_attribute to check for attribute support
+    
+    Hopefully other compilers will start adopting this so we don't have to
+    maintain ever growing matrixes of compiler/version checks for all the
+    attributes we use.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit 9b895b428576c4d6b4d43c77940c44604f9c1a2c
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Tue Jul 15 13:51:02 2014 -0700
+
+    Do not suggest adding new keysyms to XF86keysym.h
+    
+    As noted in the comment in the file, X.Org controls the main X11 keysym
+    definitions, so adds new keysyms there, not in the XFree86 vendor space.
+    
+    Reported-by: Gioele Barabucci <gioele@svario.it>
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Reviewed-by: Daniel Stone <daniels@collabora.com>
+
+commit 25f1134b4a2bd8018f153158cfc7c9ae255b5d6e
+Author: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com>
+Date:   Wed Jun 25 18:08:22 2014 +0200
+
+    Bug #80528: make it build on AIX
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=80528
+    
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 068fd2cb19b6c0434f63b427158506e2ec3c6206
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date:   Fri May 9 19:23:58 2014 -0700
+
+    Enable use of __attribute__((deprecated)) with Solaris Studio 12.4 compiler
+    
+    Support for this attribute is added in the 12.4 beta release.
+    
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
 commit 03cbbf6c3e811c026c86e3a60d2f9af56606e155
 Author: Julien Cristau <jcristau@debian.org>
 Date:   Mon Apr 14 15:36:00 2014 +0200
diff --git a/proto/x11proto/XF86keysym.h b/proto/x11proto/XF86keysym.h
index 93eb06295..8b5646ea1 100644
--- a/proto/x11proto/XF86keysym.h
+++ b/proto/x11proto/XF86keysym.h
@@ -3,29 +3,6 @@
  *
  * The XFree86 keysym range is 0x10080001 - 0x1008FFFF.
  *
- * When adding new entries, the xc/lib/XKeysymDB file should also be
- * updated to make the new entries visible to Xlib.
- */
-
-/*
- * ModeLock
- *
- * This one is old, and not really used any more since XKB offers this
- * functionality.
- */
-
-#define XF86XK_ModeLock		0x1008FF01	/* Mode Switch Lock */
-
-/*
- * Note, 0x1008FF07 - 0x1008FF0F are free and should be used for misc new
- * keysyms that don't fit into any of the groups below.
- *
- * 0x1008FF64, 0x1008FF6F, 0x1008FF71, 0x1008FF83 are no longer used,
- * and should be used first for new keysyms.
- *
- * Check in keysymdef.h for generic symbols before adding new XFree86-specific
- * symbols here.
- *
  * X.Org will not be adding to the XF86 set of keysyms, though they have
  * been adopted and are considered a "standard" part of X keysym definitions.
  * XFree86 never properly commented these keysyms, so we have done our
@@ -36,6 +13,14 @@
  * these archives, these are from memory and usage.
  */
 
+/*
+ * ModeLock
+ *
+ * This one is old, and not really used any more since XKB offers this
+ * functionality.
+ */
+
+#define XF86XK_ModeLock		0x1008FF01	/* Mode Switch Lock */
 
 /* Backlight controls. */
 #define XF86XK_MonBrightnessUp   0x1008FF02  /* Monitor/panel brightness */
diff --git a/proto/x11proto/Xfuncproto.h.in b/proto/x11proto/Xfuncproto.h.in
index dac92291e..e9e5e7141 100644
--- a/proto/x11proto/Xfuncproto.h.in
+++ b/proto/x11proto/Xfuncproto.h.in
@@ -75,15 +75,21 @@ in this Software without prior written authorization from The Open Group.
 #endif
 #endif /* _XFUNCPROTOBEGIN */
 
+/* http://clang.llvm.org/docs/LanguageExtensions.html#has-attribute */
+#ifndef __has_attribute
+# define __has_attribute(x) 0  /* Compatibility with non-clang compilers. */
+#endif
+
 /* Added in X11R6.9, so available in any version of modular xproto */
-#if defined(__GNUC__) && (__GNUC__ >= 4)
+#if __has_attribute(__sentinel__) || (defined(__GNUC__) && (__GNUC__ >= 4))
 # define _X_SENTINEL(x) __attribute__ ((__sentinel__(x)))
 #else
 # define _X_SENTINEL(x)
 #endif /* GNUC >= 4 */
 
 /* Added in X11R6.9, so available in any version of modular xproto */
-#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+#if (__has_attribute(visibility) || (defined(__GNUC__) && (__GNUC__ >= 4))) \
+    && !defined(__CYGWIN__) && !defined(__MINGW32__)
 # define _X_EXPORT      __attribute__((visibility("default")))
 # define _X_HIDDEN      __attribute__((visibility("hidden")))
 # define _X_INTERNAL    __attribute__((visibility("internal")))
@@ -109,29 +115,34 @@ in this Software without prior written authorization from The Open Group.
 
 /* Bulk branch prediction hints via marking error path functions as "cold" */
 /* requires xproto >= 7.0.25 */
-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 403) /* 4.3+ */
+#if __has_attribute(__cold__) || \
+    (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 403)) /* 4.3+ */
 # define _X_COLD __attribute__((__cold__))
 #else
 # define _X_COLD /* nothing */
 #endif
 
 /* Added in X11R6.9, so available in any version of modular xproto */
-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)
+#if __has_attribute(deprecated) \
+    || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)) \
+    || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x5130))
 # define _X_DEPRECATED  __attribute__((deprecated))
 #else /* not gcc >= 3.1 */
 # define _X_DEPRECATED
 #endif
 
 /* requires xproto >= 7.0.17 */
-#if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
-	|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#if __has_attribute(noreturn) \
+    || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
+    || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
 # define _X_NORETURN __attribute((noreturn))
 #else
 # define _X_NORETURN
 #endif /* GNUC  */
 
 /* Added in X11R6.9, so available in any version of modular xproto */
-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)
+#if __has_attribute(__format__) \
+    || defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)
 # define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y)))
 #else /* not gcc >= 2.3 */
 # define _X_ATTRIBUTE_PRINTF(x,y)
@@ -140,14 +151,16 @@ in this Software without prior written authorization from The Open Group.
 /* requires xproto >= 7.0.22 - since this uses either gcc or C99 variable
    argument macros, must be only used inside #ifdef _X_NONNULL guards, as
    many legacy X clients are compiled in C89 mode still. */
-#if defined(__GNUC__) &&  ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
+#if __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 */
 #define _X_NONNULL(...)  /* */
 #endif
 
 /* requires xproto >= 7.0.22 */
-#if defined(__GNUC__) &&  ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)
+#if __has_attribute(__unused__) \
+    || defined(__GNUC__) &&  ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)
 #define _X_UNUSED  __attribute__((__unused__))
 #else
 #define _X_UNUSED  /* */
diff --git a/proto/x11proto/Xfuncs.h b/proto/x11proto/Xfuncs.h
index 2bcf991a9..469bb48d5 100644
--- a/proto/x11proto/Xfuncs.h
+++ b/proto/x11proto/Xfuncs.h
@@ -37,14 +37,14 @@ void bcopy();
 void bzero();
 int bcmp();
 #  else
-#   if defined(SYSV) && !defined(__SCO__) && !defined(__sun) && !defined(__UNIXWARE__)
+#   if defined(SYSV) && !defined(__SCO__) && !defined(__sun) && !defined(__UNIXWARE__) && !defined(_AIX)
 #    include <memory.h>
 void bcopy();
 #    define bzero(b,len) memset(b, 0, len)
 #    define bcmp(b1,b2,len) memcmp(b1, b2, len)
 #   else
 #    include <string.h>
-#    if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__) || defined(__CYGWIN__)
+#    if defined(__SCO__) || defined(__sun) || defined(__UNIXWARE__) || defined(__CYGWIN__) || defined(_AIX)
 #     include <strings.h>
 #    endif
 #    define _XFUNCS_H_INCLUDED_STRING_H
diff --git a/proto/x11proto/Xos.h b/proto/x11proto/Xos.h
index 044d22b4f..7e5394685 100644
--- a/proto/x11proto/Xos.h
+++ b/proto/x11proto/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__)
+# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__) || defined(_AIX)
 #  include <strings.h>
 # else
 #  ifndef index
diff --git a/proto/x11proto/configure.ac b/proto/x11proto/configure.ac
index 355fd0b35..17098621b 100644
--- a/proto/x11proto/configure.ac
+++ b/proto/x11proto/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([Xproto], [7.0.26],
+AC_INIT([Xproto], [7.0.27],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])