Update from glibc.

diff --git a/gettext-runtime/intl/libintl.glibc b/gettext-runtime/intl/libintl.glibc
index 7c10519a204715dbbe20ffd71840f1d5a79e74a8..e82607dc8b1504122fb3f7692b6f369f8f064a60 100644 (file)
--- a/gettext-runtime/intl/libintl.glibc
+++ b/gettext-runtime/intl/libintl.glibc
@@ -1,21 +1,22 @@
 /* Message catalogs for internationalization.
-   Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1995-2002, 2004, 2005 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
    This file is derived from the file libgettext.h in the GNU gettext package.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library 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
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin Street,
-   Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 #ifndef _LIBINTL_H
 #define _LIBINTL_H     1
@@ -26,24 +27,31 @@
    implementation of gettext.  */
 #define __USE_GNU_GETTEXT 1
 
+/* Provide information about the supported file formats.  Returns the
+   maximum minor revision number supported for a given major revision.  */
+#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
+  ((major) == 0 || (major) == 1 ? 1 : -1)
+
 __BEGIN_DECLS
 
 /* Look up MSGID in the current default message catalog for the current
    LC_MESSAGES locale.  If not found, returns MSGID itself (the default
    text).  */
-extern char *gettext (__const char *__msgid) __THROW;
+extern char *gettext (__const char *__msgid)
+     __THROW __attribute_format_arg__ (1);
 
 /* Look up MSGID in the DOMAINNAME message catalog for the current
    LC_MESSAGES locale.  */
 extern char *dgettext (__const char *__domainname, __const char *__msgid)
-     __THROW;
+     __THROW __attribute_format_arg__ (2);
 extern char *__dgettext (__const char *__domainname, __const char *__msgid)
      __THROW __attribute_format_arg__ (2);
 
 /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
    locale.  */
 extern char *dcgettext (__const char *__domainname,
-                       __const char *__msgid, int __category) __THROW;
+                       __const char *__msgid, int __category)
+     __THROW __attribute_format_arg__ (2);
 extern char *__dcgettext (__const char *__domainname,
                          __const char *__msgid, int __category)
      __THROW __attribute_format_arg__ (2);
@@ -53,20 +61,20 @@ extern char *__dcgettext (__const char *__domainname,
    number N.  */
 extern char *ngettext (__const char *__msgid1, __const char *__msgid2,
                       unsigned long int __n)
-     __THROW __attribute_format_arg__ (1);
+     __THROW __attribute_format_arg__ (1) __attribute_format_arg__ (2);
 
 /* Similar to `dgettext' but select the plural form corresponding to the
    number N.  */
 extern char *dngettext (__const char *__domainname, __const char *__msgid1,
                        __const char *__msgid2, unsigned long int __n)
-     __THROW __attribute_format_arg__ (2);
+     __THROW __attribute_format_arg__ (2) __attribute_format_arg__ (3);
 
 /* Similar to `dcgettext' but select the plural form corresponding to the
    number N.  */
 extern char *dcngettext (__const char *__domainname, __const char *__msgid1,
                         __const char *__msgid2, unsigned long int __n,
                         int __category)
-     __THROW __attribute_format_arg__ (2);
+     __THROW __attribute_format_arg__ (2) __attribute_format_arg__ (3);
 
 
 /* Set the current default message catalog to DOMAINNAME.
@@ -86,7 +94,7 @@ extern char *bind_textdomain_codeset (__const char *__domainname,
 
 
 /* Optimized version of the function above.  */
-#if defined __OPTIMIZE__
+#if defined __OPTIMIZE__ && !defined __cplusplus
 
 /* We need NULL for `gettext'.  */
 # define __need_NULL