X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxvasprintf.h;h=4f3b1360a236db6b65aab88bbd687f6944ecf087;hb=fbe6ced5d2fdadeeea4194725d05a52cf3b5ebd7;hp=95a681fa869460c70ae167975a9a0f0444b3a466;hpb=0f2c51f68bf088cd445a9625d19ed5d381aa0f80;p=gnulib.git
diff --git a/lib/xvasprintf.h b/lib/xvasprintf.h
index 95a681fa8..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 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
#ifndef _XVASPRINTF_H
#define _XVASPRINTF_H
@@ -22,26 +21,23 @@
#include
#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().
- If the memory allocation succeeds, store the address of the string in
- *RESULT and return the number of resulting bytes, excluding the trailing
- NUL. 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,
@@ -52,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