X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxvasprintf.h;h=4f3b1360a236db6b65aab88bbd687f6944ecf087;hb=7ba06c8ff37d8725cb824c64b94be41b9294ffb7;hp=8777f1374a5b06206bbdadaa6ba1b20137c8e691;hpb=9f85c9185524b3117898bcec9794e1891a588546;p=gnulib.git

diff --git a/lib/xvasprintf.h b/lib/xvasprintf.h
index 8777f1374..4f3b1360a 100644
--- a/lib/xvasprintf.h
+++ b/lib/xvasprintf.h
@@ -1,19 +1,18 @@
 /* vasprintf and asprintf with out-of-memory checking.
-   Copyright (C) 2002-2004, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2006-2010 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _XVASPRINTF_H
 #define _XVASPRINTF_H
@@ -22,24 +21,23 @@
 #include <stdarg.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
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 extern "C" {
 #endif
 
-/* Write formatted output to a string dynamically allocated with malloc().
-   Upon [ENOMEM] memory allocation error, call xalloc_die.
+/* Write formatted output to a string dynamically allocated with malloc(),
+   and return it.  Upon [ENOMEM] memory allocation error, call xalloc_die.
    On some other error
      - [EOVERFLOW] resulting string length is > INT_MAX,
      - [EINVAL] invalid format string,
@@ -50,7 +48,7 @@ extern char *xasprintf (const char *format, ...)
 extern char *xvasprintf (const char *format, va_list args)
        __attribute__ ((__format__ (__printf__, 1, 0)));
 
-#ifdef	__cplusplus
+#ifdef __cplusplus
 }
 #endif