Update to x11proto 7.0.31

4 files changed, 85 insertions, 3 deletions

diff --git a/proto/x11proto/ChangeLog b/proto/x11proto/ChangeLog
index 82c66ed60..7ad45c5e1 100644
--- a/proto/x11proto/ChangeLog
+++ b/proto/x11proto/ChangeLog
@@ -1,3 +1,64 @@
+commit f3b7b856777500113cee524dbd295fcbbce11fab
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Sep 23 09:49:36 2016 +0300
+
+    xproto 7.0.31
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+
+commit d59bd3ade1a8430282c3395d5f5b22ebaa339976
+Author: Keith Packard <keithp@keithp.com>
+Date:   Fri Sep 23 02:35:36 2016 +0300
+
+    Fix typo __has_extenstion -> __has_extension
+    
+    Signed-off-by: Keith Packard <keithp@keithp.com>
+    Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit bd3832a988c34304b54ba3bbab5befb3dbcae90d
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date:   Thu Sep 22 14:31:11 2016 -0700
+
+    xproto 7.0.30
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+
+commit ad959de4f4fd821cf95522994395ad668eb6756f
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date:   Mon Sep 19 13:17:39 2016 -0700
+
+    Xfuncproto: Add support for _X_NOTSAN macro
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+    Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 9a9382de9036fc0f3b5555ee4d340c7dd234c424
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date:   Mon Sep 19 13:14:34 2016 -0700
+
+    Xfuncproto: Add support for _X_DEPRECATED_MSG() macro
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+    Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 34a95f725c200b9aedc8c634851474d9bcce712e
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date:   Mon Sep 19 13:12:35 2016 -0700
+
+    Xfuncproto.h: Define __has_extension() if it isn't already
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+    Reviewed-by: Keith Packard <keithp@keithp.com>
+
+commit 4855c9229f00927a343f563db58e261db8a187fa
+Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+Date:   Mon Sep 19 13:10:34 2016 -0700
+
+    Xfuncproto.h: Define __has_feature() if it isn't already
+    
+    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
+    Reviewed-by: Keith Packard <keithp@keithp.com>
+
 commit 3e975a39b002070d245d21838f837aaf6e5c41d0
 Author: Julien Cristau <jcristau@debian.org>
 Date:   Fri May 13 10:28:12 2016 +0200
@@ -1008,7 +1069,7 @@ Date:   Sat Mar 27 16:38:27 2010 -0400
 
     config: remove execute permission on configuration file
     
-    Introduced in commit 	c879dab58f82f4789f27933c22706c84015f8684
+    Introduced in commit    c879dab58f82f4789f27933c22706c84015f8684
     "avoid checking for fds_bits on mingw"
     
     Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/proto/x11proto/Xfuncproto.h.in b/proto/x11proto/Xfuncproto.h.in
index 5daa83e34..b88493df2 100644
--- a/proto/x11proto/Xfuncproto.h.in
+++ b/proto/x11proto/Xfuncproto.h.in
@@ -79,6 +79,12 @@ in this Software without prior written authorization from The Open Group.
 #ifndef __has_attribute
 # define __has_attribute(x) 0  /* Compatibility with non-clang compilers. */
 #endif
+#ifndef __has_feature
+# define __has_feature(x) 0    /* Compatibility with non-clang compilers. */
+#endif
+#ifndef __has_extension
+# define __has_extension(x) 0  /* Compatibility with non-clang compilers. */
+#endif
 
 /* Added in X11R6.9, so available in any version of modular xproto */
 #if __has_attribute(__sentinel__) || (defined(__GNUC__) && (__GNUC__ >= 4))
@@ -131,6 +137,14 @@ in this Software without prior written authorization from The Open Group.
 # define _X_DEPRECATED
 #endif
 
+/* requires xproto >= 7.0.30 */
+#if __has_extension(attribute_deprecated_with_message) || \
+                (defined(__GNUC__) && ((__GNUC__ >= 5) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 5))))
+# define _X_DEPRECATED_MSG(_msg) __attribute__((deprecated(_msg)))
+#else
+# define _X_DEPRECATED_MSG(_msg) _X_DEPRECATED
+#endif
+
 /* requires xproto >= 7.0.17 */
 #if __has_attribute(noreturn) \
     || (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
@@ -196,4 +210,11 @@ in this Software without prior written authorization from The Open Group.
 # endif
 #endif
 
+/* requires xproto >= 7.0.30 */
+#if __has_attribute(no_sanitize_thread)
+# define _X_NOTSAN __attribute__((no_sanitize_thread))
+#else
+# define _X_NOTSAN
+#endif
+
 #endif /* _XFUNCPROTO_H_ */
diff --git a/proto/x11proto/compile b/proto/x11proto/compile
index a85b723c7..531136b06 100644
--- a/proto/x11proto/compile
+++ b/proto/x11proto/compile
@@ -3,7 +3,7 @@
 
 scriptversion=2012-10-14.11; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
diff --git a/proto/x11proto/configure.ac b/proto/x11proto/configure.ac
index bc6409aa9..2b91a9d7b 100644
--- a/proto/x11proto/configure.ac
+++ b/proto/x11proto/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([Xproto], [7.0.29],
+AC_INIT([Xproto], [7.0.31],
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])