From 83c0f41ff0a3964e86fd0083a7aba4d587b5451b Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 7 May 2005 20:36:13 +0000 Subject: [PATCH] * intl/libintl.h: Always use __attribute_format_arg__ for gettext functions since gcc sometimes forgets the attribute for the standard functions. --- ChangeLog | 6 ++++++ intl/libintl.h | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2416243f1d..beafec6419 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-05-07 Ulrich Drepper + + * intl/libintl.h: Always use __attribute_format_arg__ for gettext + functions since gcc sometimes forgets the attribute for the + standard functions. + 2005-05-06 Jakub Jelinek [BZ #934] diff --git a/intl/libintl.h b/intl/libintl.h index 6561c78370..544dec3533 100644 --- a/intl/libintl.h +++ b/intl/libintl.h @@ -1,5 +1,5 @@ /* Message catalogs for internationalization. - Copyright (C) 1995-1999, 2000-2002, 2004 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. @@ -37,19 +37,21 @@ __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);