diff options
| author | Bruno Haible <bruno@clisp.org> | 2006-03-14 14:22:12 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:13:02 +0200 |
| commit | 97d0e980135554fe5a8ee4cfb59e410bf9d81ae3 (patch) | |
| tree | 833279a40882c952e2627d6960623542a6bc29b9 | |
| parent | b44746da5bb39a1e7a8ef3eb4af26a2c1021c965 (diff) | |
| download | external_gettext-97d0e980135554fe5a8ee4cfb59e410bf9d81ae3.zip external_gettext-97d0e980135554fe5a8ee4cfb59e410bf9d81ae3.tar.gz external_gettext-97d0e980135554fe5a8ee4cfb59e410bf9d81ae3.tar.bz2 | |
Avoid syntax error with g++ on MacOS X.
| -rw-r--r-- | gettext-runtime/intl/ChangeLog | 5 | ||||
| -rw-r--r-- | gettext-runtime/intl/libgnuintl.h.in | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog index 982046f..d965ed5 100644 --- a/gettext-runtime/intl/ChangeLog +++ b/gettext-runtime/intl/ChangeLog @@ -1,3 +1,8 @@ +2006-03-11 Bruno Haible <bruno@clisp.org> + + * libgnuintl.h.in (_INTL_MAY_RETURN_STRING_ARG): Define to empty when + using g++ on MacOS X. + 2006-01-22 Bruno Haible <bruno@clisp.org> * vasnprintf.c (VASNPRINTF): In the computation of the size of the diff --git a/gettext-runtime/intl/libgnuintl.h.in b/gettext-runtime/intl/libgnuintl.h.in index b824076..284fbf0 100644 --- a/gettext-runtime/intl/libgnuintl.h.in +++ b/gettext-runtime/intl/libgnuintl.h.in @@ -1,5 +1,5 @@ /* Message catalogs for internationalization. - Copyright (C) 1995-1997, 2000-2005 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 2000-2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published @@ -110,7 +110,7 @@ extern int libintl_version; /* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return its n-th argument literally. This enables GCC to warn for example about printf (gettext ("foo %y")). */ -#if __GNUC__ >= 3 +#if __GNUC__ >= 3 && !(__APPLE_CC__ > 1 && defined __cplusplus) # define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n))) #else # define _INTL_MAY_RETURN_STRING_ARG(n) |