Avoid syntax error with g++ on MacOS X.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 982046f7cad5874f6727aabc8ac2a5970ef026e3..d965ed5d8f09dc291f62e868d58decc7f3c39655 100644 (file)
--- 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 b824076cc01ada9f1feccbbd280d93ae4ce8c735..284fbf096b260a147195c975fcc7f187cb97c93b 100644 (file)
--- 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)