X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fxprintf.h;h=91ba55da54aa94c75a8067ece90305154c85c725;hb=497bb5fc57d14e07115482157ed318d078a83083;hp=5340aa3b2baa1568e05b7880c6bb940c07a4ce19;hpb=7c0971900b114a82fc362b5178ec9a4a2865dbbf;p=gnulib.git

diff --git a/lib/xprintf.h b/lib/xprintf.h
index 5340aa3b2..91ba55da5 100644
--- a/lib/xprintf.h
+++ b/lib/xprintf.h
@@ -1,5 +1,5 @@
 /* printf wrappers that fail immediately for non-file-related errors
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,15 +21,14 @@
 #include <stdio.h>
 
 #ifndef __attribute__
-/* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
-#  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
 
@@ -40,7 +39,7 @@ extern int xvprintf (char const *restrict format, va_list args)
 extern int xfprintf (FILE *restrict stream, char const *restrict format, ...)
   __attribute__ ((__format__ (__printf__, 2, 3)));
 extern int xvfprintf (FILE *restrict stream, char const *restrict format,
-		      va_list args)
+                      va_list args)
   __attribute__ ((__format__ (__printf__, 2, 0)));
 
 #endif