From: Bruno Haible <bruno@clisp.org>
Date: Fri, 29 Sep 2000 21:19:39 +0000 (+0000)
Subject: Update libintl.glibc.
X-Git-Tag: v0.10.36~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=202aada30d41eda52fb44731fbe071154f2de6cd;p=thirdparty%2Fgettext.git

Update libintl.glibc.
---

diff --git a/intl/ChangeLog b/intl/ChangeLog
index d51b5850b..5848f0822 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-29  Bruno Haible  <haible@clisp.cons.org>
+
+	* libintl.glibc: Update from current glibc version.
+
 2000-09-18  Bruno Haible  <haible@clisp.cons.org>
 
 	* dcigettext.c: Outside libc, use local variable names that don't
diff --git a/intl/libintl.glibc b/intl/libintl.glibc
index 967a8cafc..eb81d7cd3 100644
--- a/intl/libintl.glibc
+++ b/intl/libintl.glibc
@@ -35,37 +35,38 @@ extern char *gettext (__const char *__msgid) __THROW;
 
 /* Look up MSGID in the DOMAINNAME message catalog for the current
    LC_MESSAGES locale.  */
-extern char *dgettext (__const char *__domainname,
-		       __const char *__msgid) __THROW;
-extern char *__dgettext (__const char *__domainname,
-			 __const char *__msgid) __THROW;
+extern char *dgettext (__const char *__domainname, __const char *__msgid)
+     __THROW;
+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;
 extern char *__dcgettext (__const char *__domainname,
-			  __const char *__msgid, int __category) __THROW;
+			  __const char *__msgid, int __category)
+     __THROW __attribute_format_arg__ (2);
 
 
 /* Similar to `gettext' but select the plural form corresponding to the
    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);
 
 /* 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);
 
 /* 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);
 
 
 /* Set the current default message catalog to DOMAINNAME.