Use attributes from the implementation namespace. Applications might be

redefining them otherwise and creating conflicts. Bump revision.

3 files changed, 45 insertions, 12 deletions

diff --git a/x11/xproto/Makefile b/x11/xproto/Makefile
index 02bca206663..55eaadbde1a 100644
--- a/x11/xproto/Makefile
+++ b/x11/xproto/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2012/10/29 05:07:19 asau Exp $
+# $NetBSD: Makefile,v 1.22 2012/11/16 20:04:47 joerg Exp $
 #
 
 DISTNAME=		xproto-7.0.23
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=proto/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/xproto/distinfo b/x11/xproto/distinfo
index 984cad78adc..2c2cf94c846 100644
--- a/x11/xproto/distinfo
+++ b/x11/xproto/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2012/09/05 16:46:55 jperkin Exp $
+$NetBSD: distinfo,v 1.20 2012/11/16 20:04:47 joerg Exp $
 
 SHA1 (xproto-7.0.23.tar.bz2) = 5d7f00d1dbe6cf8e725841ef663f0ee2491ba5b2
 RMD160 (xproto-7.0.23.tar.bz2) = b4077227a012c90cbcab8b6e7a289931b2ee6efb
 Size (xproto-7.0.23.tar.bz2) = 290114 bytes
 SHA1 (patch-aa) = 22cfcde47f2139c685286e97968bfc0c708e1fea
 SHA1 (patch-ab) = 9327483e9a48b8715cd212c84dfa3f9e120bbb7f
-SHA1 (patch-ad) = 42a1f0523738ff125d8abf420c4449eac39fed1c
+SHA1 (patch-ad) = d6c005848abad31861983fcd14d0c37520b81cac
 SHA1 (patch-configure) = 9656a03001a26a8853dc21a37c8b3ae25a8562ad
diff --git a/x11/xproto/patches/patch-ad b/x11/xproto/patches/patch-ad
index 858dccd9a1e..43894609425 100644
--- a/x11/xproto/patches/patch-ad
+++ b/x11/xproto/patches/patch-ad
@@ -1,19 +1,52 @@
-$NetBSD: patch-ad,v 1.4 2012/09/05 16:46:55 jperkin Exp $
+$NetBSD: patch-ad,v 1.5 2012/11/16 20:04:48 joerg Exp $
 
 Patch from https://bugs.freedesktop.org/attachment.cgi?id=66181
 
---- Xfuncproto.h.in.orig	Fri Mar 16 06:11:44 2012
-+++ Xfuncproto.h.in	Wed Sep  5 15:10:40 2012
-@@ -83,7 +83,7 @@
+--- Xfuncproto.h.in.orig	2012-03-16 06:11:44.000000000 +0000
++++ Xfuncproto.h.in
+@@ -83,10 +83,10 @@ in this Software without prior written a
  #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")))
+-# define _X_INTERNAL    __attribute__((visibility("internal")))
 +#if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__) && !defined(__sun)
- # define _X_EXPORT      __attribute__((visibility("default")))
- # define _X_HIDDEN      __attribute__((visibility("hidden")))
- # define _X_INTERNAL    __attribute__((visibility("internal")))
-@@ -161,7 +161,8 @@
++# define _X_EXPORT      __attribute__((__visibility__("default")))
++# define _X_HIDDEN      __attribute__((__visibility__("hidden")))
++# define _X_INTERNAL    __attribute__((__visibility__("internal")))
+ #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+ # define _X_EXPORT      __global
+ # define _X_HIDDEN      __hidden
+@@ -108,7 +108,7 @@ in this Software without prior written a
+ 
+ /* 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))
++# define _X_DEPRECATED  __attribute__((__deprecated__))
+ #else /* not gcc >= 3.1 */
+ # define _X_DEPRECATED
+ #endif
+@@ -116,7 +116,7 @@ in this Software without prior written a
+ /* requires xproto >= 7.0.17 */
+ #if (defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205)) \
+ 	|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+-# define _X_NORETURN __attribute((noreturn))
++# define _X_NORETURN __attribute((__noreturn__))
+ #else
+ # define _X_NORETURN
+ #endif /* GNUC  */
+@@ -132,7 +132,7 @@ in this Software without prior written a
+    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)
+-#define _X_NONNULL(args...)  __attribute__((nonnull(args)))
++#define _X_NONNULL(args...)  __attribute__((__nonnull(args__)))
+ #elif defined(__STDC_VERSION__) && (__STDC_VERSION__ - 0 >= 199901L) /* C99 */
+ #define _X_NONNULL(...)  /* */
+ #endif
+@@ -161,7 +161,8 @@ in this Software without prior written a
  /* requires xproto >= 7.0.21 */
  #ifndef _X_RESTRICT_KYWD
  # if defined(restrict) /* assume autoconf set it correctly */ || \