Merge remote-tracking branch 'origin/released'

Conflicts:
	X11/Xfuncproto.h.in
	X11/configure.ac
	X11/keysymdef.h
	freetype/include/freetype/internal/pcftypes.h
	freetype/src/cache/ftcbasic.c
	freetype/src/cache/ftccmap.c
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/link_functions.cpp
	mesalib/src/mesa/main/dlist.c
	mesalib/src/mesa/program/prog_optimize.c
	mesalib/src/mesa/state_tracker/st_program.c
	pthreads/Makefile

1 files changed, 25 insertions, 2 deletions

diff --git a/X11/Xfuncproto.h.in b/X11/Xfuncproto.h.in
index cf4b7c1ac..b1332814c 100644
--- a/X11/Xfuncproto.h.in
+++ b/X11/Xfuncproto.h.in
@@ -75,12 +75,14 @@ in this Software without prior written authorization from The Open Group.
 #endif

 #endif /* _XFUNCPROTOBEGIN */

 

+/* Added in X11R6.9, so available in any version of modular xproto */

 #if 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__)

 # define _X_EXPORT      __attribute__((visibility("default")))

 # define _X_HIDDEN      __attribute__((visibility("hidden")))

@@ -95,6 +97,7 @@ in this Software without prior written authorization from The Open Group.
 # define _X_INTERNAL

 #endif /* GNUC >= 4 */

 

+/* requires xproto >= 7.0.9 */

 #if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)

 # define _X_LIKELY(x)   __builtin_expect(!!(x), 1)

 # define _X_UNLIKELY(x) __builtin_expect(!!(x), 0)

@@ -103,12 +106,14 @@ in this Software without prior written authorization from The Open Group.
 # define _X_UNLIKELY(x) (x)

 #endif

 

+/* Added in X11R6.9, so available in any version of modular xproto */

 #if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)

 # 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))

 # define _X_NORETURN __attribute((noreturn))

@@ -116,15 +121,32 @@ in this Software without prior written authorization from The Open Group.
 # 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)

 # define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y)))

 #else /* not gcc >= 2.3 */

 # define _X_ATTRIBUTE_PRINTF(x,y)

 #endif

 

+/* requires xproto >= 7.0.22 */

+#if defined(__GNUC__) &&  ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)

+#define _X_NONNULL(args...)  __attribute__((nonnull(args)))

+#else

+#define _X_NONNULL(...)  /* */

+#endif

+

+/* requires xproto >= 7.0.22 */

+#if defined(__GNUC__) &&  ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)

+#define _X_UNUSED  __attribute__((__unused__))

+#else

+#define _X_UNUSED  /* */

+#endif

+

 /* C99 keyword "inline" or equivalent extensions in pre-C99 compilers */

+/* requires xproto >= 7.0.9

+   (introduced in 7.0.8 but didn't support all compilers until 7.0.9) */

 #if defined(inline) /* assume autoconf set it correctly */ || \

-   (defined(__STDC__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */ || \

+   (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */ || \

    (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550))

 # define _X_INLINE inline

 #elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */

@@ -134,9 +156,10 @@ in this Software without prior written authorization from The Open Group.
 #endif

 

 /* C99 keyword "restrict" or equivalent extensions in pre-C99 compilers */

+/* requires xproto >= 7.0.21 */

 #ifndef _X_RESTRICT_KYWD

 # if defined(restrict) /* assume autoconf set it correctly */ || \

-   (defined(__STDC__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */

+   (defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */

 #  define _X_RESTRICT_KYWD  restrict

 # elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */

 #  define _X_RESTRICT_KYWD __restrict__