Update.

2001-07-22  Bruno Haible  <haible@clisp.cons.org>

	* intl/libintl.h (ngettext, dngettext, dcngettext): Use both msgid1
	and msgid2 for printf format argument checking.

diff --git a/ChangeLog b/ChangeLog
index aa3dffe..ed81dbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-22  Bruno Haible  <haible@clisp.cons.org>
+
+       * intl/libintl.h (ngettext, dngettext, dcngettext): Use both msgid1
+       and msgid2 for printf format argument checking.
+
 2001-07-24  Ulrich Drepper  <drepper@redhat.com>
 
        * iconv/gconv_cache.c (find_module): Don't allocate room for the

diff --git a/intl/libintl.h b/intl/libintl.h
index dd69ec2..95eb900 100644 (file)
--- a/intl/libintl.h
+++ b/intl/libintl.h
@@ -54,20 +54,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.

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 8644eda..36ae2fa 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-24  Ulrich Drepper  <drepper@redhat.com>
+
+       * tst-context.c (main): Print explanation before bailing out
+       because context handling is not supported.
+
 2001-07-23  Ulrich Drepper  <drepper@redhat.com>
 
        * Makefile (tests): Add tst-context.

diff --git a/linuxthreads/tst-context.c b/linuxthreads/tst-context.c
index cf4783d..82a877c 100644 (file)
--- a/linuxthreads/tst-context.c
+++ b/linuxthreads/tst-context.c
@@ -67,7 +67,10 @@ main (void)
   if (getcontext (&mctx) != 0)
     {
       if (errno == ENOSYS)
-       exit (0);
+       {
+         puts ("context handling not supported");
+         exit (0);
+       }
 
       printf ("%s: getcontext: %m\n", __FUNCTION__);
       exit (1);

diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index 4bdfa08..02454ee 100644 (file)
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -162,7 +162,10 @@
 
 /* At some point during the gcc 2.8 development the `format_arg' attribute
    for functions was introduced.  We don't want to use it unconditionally
-   (although this would be possible) since it generates warnings.  */
+   (although this would be possible) since it generates warnings.
+   If several `format_arg' attributes are given for the same function, in
+   gcc-3.0 and older, all but the last one are ignored.  In newer gccs,
+   all designated arguments are considered.  */
 #if __GNUC_PREREQ (2,8)
 # define __attribute_format_arg__(x) __attribute__ ((__format_arg__ (x)))
 #else