Imported Upstream version 3.2.0

[debian/amanda] / gnulib / vasnprintf.h

diff --git a/gnulib/vasnprintf.h b/gnulib/vasnprintf.h
index 894008caec140cbc7bc82c2783f3dbb2c52ae8ea..a689bad25af61a0cb3e33334fd6f5df831a98440 100644 (file)
--- a/gnulib/vasnprintf.h
+++ b/gnulib/vasnprintf.h
@@ -1,9 +1,9 @@
 /* vsprintf with automatic memory allocation.
 /* vsprintf with automatic memory allocation.

-   Copyright (C) 2002-2004 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 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
 
    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)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    This program is distributed in the hope that it will be useful,
    any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -25,19 +25,18 @@
 #include <stddef.h>
 
 #ifndef __attribute__
 #include <stddef.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)
 # if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)

-#  define __format__ format
-#  define __printf__ printf
+#  define __attribute__(Spec)   /* empty */

 # endif
 #endif
 
 # endif
 #endif
 

-#ifdef __cplusplus
+#ifdef __cplusplus

 extern "C" {
 #endif
 
 extern "C" {
 #endif
 


@@ -65,12 +64,16 @@ extern "C" {
                 free (output);
             }
   */
                 free (output);
             }
   */

+#if REPLACE_VASNPRINTF
+# define asnprintf rpl_asnprintf
+# define vasnprintf rpl_vasnprintf
+#endif

 extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
        __attribute__ ((__format__ (__printf__, 3, 4)));
 extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
        __attribute__ ((__format__ (__printf__, 3, 0)));
 
 extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
        __attribute__ ((__format__ (__printf__, 3, 4)));
 extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
        __attribute__ ((__format__ (__printf__, 3, 0)));
 

-#ifdef __cplusplus
+#ifdef __cplusplus

 }
 #endif
 
 }
 #endif