X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxvasprintf.h;h=4f3b1360a236db6b65aab88bbd687f6944ecf087;hb=fbe6ced5d2fdadeeea4194725d05a52cf3b5ebd7;hp=acea805636890f0fb3e9875ab26870540f9786c9;hpb=b2e2010c7c902235b5efb5bd3c6529f61b093aa4;p=gnulib.git

diff --git a/lib/xvasprintf.h b/lib/xvasprintf.h
index acea80563..4f3b1360a 100644
--- a/lib/xvasprintf.h
+++ b/lib/xvasprintf.h
@@ -21,15 +21,14 @@
 #include <stdarg.h>
 
 #ifndef __attribute__
-/* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)
-#  define __attribute__(Spec) /* empty */
-# endif
-/* The __-protected variants of `format' and `printf' attributes
-   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
+/* The __attribute__ feature is available in gcc versions 2.5 and later.
+   The __-protected variants of the attributes 'format' and 'printf' are
+   accepted by gcc versions 2.6.4 (effectively 2.7) and later.
+   We enable __attribute__ only if these are supported too, because
+   gnulib and libintl do '#define printf __printf__' when they override
+   the 'printf' function.  */
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
-#  define __format__ format
-#  define __printf__ printf
+#  define __attribute__(Spec)   /* empty */
 # endif
 #endif