Imported Upstream version 2.6.1

[debian/amanda] / gnulib / vasnprintf.h

diff --git a/gnulib/vasnprintf.h b/gnulib/vasnprintf.h
index 894008caec140cbc7bc82c2783f3dbb2c52ae8ea..b9a3d6edcdc819f27626764da978d5849955ea4b 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-2008 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,


@@ -26,7 +26,7 @@
 
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */
 
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */

-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5)

 #  define __attribute__(Spec) /* empty */
 # endif
 /* The __-protected variants of `format' and `printf' attributes
 #  define __attribute__(Spec) /* empty */
 # endif
 /* The __-protected variants of `format' and `printf' attributes


@@ -37,7 +37,7 @@
 # endif
 #endif
 
 # endif
 #endif
 

-#ifdef __cplusplus
+#ifdef __cplusplus

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


@@ -65,12 +65,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