summaryrefslogtreecommitdiff
path: root/lib/vasnprintf.h
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2011-03-07 06:27:42 -0500
committerMark H Weaver <mhw@netris.org>2011-03-09 17:06:05 -0500
commitdd36ce77cd899c7b179026603e751e3bb47b2943 (patch)
treed2f26243f1b6bbb025dea3919ce47f7bc29993cc /lib/vasnprintf.h
parentdf1297956211b7353155c9b54d7e9c22d05ce493 (diff)
downloadguile-dd36ce77cd899c7b179026603e751e3bb47b2943.tar.gz
Update Gnulib; add new modules; remove `round' module.
This updates Gnulib to v0.0-4951-g6ff7b70. * m4/gnulib-cache.m4: Add floor, ceil, frexp, and ldexp. Add wchar as an explicit dependency; it had been present as an indirect dependency before, but no longer. Remove round, which I had requested earlier, but turned out to be unnecessary.
Diffstat (limited to 'lib/vasnprintf.h')
-rw-r--r--lib/vasnprintf.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/vasnprintf.h b/lib/vasnprintf.h
index 7ae03da8e..e2de468aa 100644
--- a/lib/vasnprintf.h
+++ b/lib/vasnprintf.h
@@ -24,16 +24,16 @@
/* Get size_t. */
#include <stddef.h>
-#ifndef __attribute__
/* 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
+ We enable _GL_ATTRIBUTE_FORMAT 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 __attribute__(Spec) /* empty */
-# endif
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+# define _GL_ATTRIBUTE_FORMAT(spec) __attribute__ ((__format__ spec))
+#else
+# define _GL_ATTRIBUTE_FORMAT(spec) /* empty */
#endif
#ifdef __cplusplus
@@ -69,9 +69,9 @@ extern "C" {
# define vasnprintf rpl_vasnprintf
#endif
extern char * asnprintf (char *resultbuf, size_t *lengthp, const char *format, ...)
- __attribute__ ((__format__ (__printf__, 3, 4)));
+ _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 4));
extern char * vasnprintf (char *resultbuf, size_t *lengthp, const char *format, va_list args)
- __attribute__ ((__format__ (__printf__, 3, 0)));
+ _GL_ATTRIBUTE_FORMAT ((__printf__, 3, 0));
#ifdef __cplusplus
}