|
|
@@ -2,7 +2,7 @@
|
|
|
Copyright (C) 1995-1998, 2000-2002, 2004-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
|
|
|
+ under the terms of the GNU General Public License as published
|
|
|
by the Free Software Foundation; either version 2, or (at your option)
|
|
|
any later version.
|
|
|
|
|
|
@@ -11,7 +11,7 @@
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
Library General Public License for more details.
|
|
|
|
|
|
- You should have received a copy of the GNU Library General Public
|
|
|
+ You should have received a copy of the GNU General Public
|
|
|
License along with this program; if not, write to the Free Software
|
|
|
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
|
|
USA. */
|
|
|
@@ -65,17 +65,22 @@
|
|
|
On pre-ANSI systems without 'const', the config.h file is supposed to
|
|
|
contain "#define const". */
|
|
|
# define gettext(Msgid) ((const char *) (Msgid))
|
|
|
-# define dgettext(Domainname, Msgid) ((const char *) (Msgid))
|
|
|
-# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid))
|
|
|
+# define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid))
|
|
|
+# define dcgettext(Domainname, Msgid, Category) \
|
|
|
+ ((void) (Category), dgettext (Domainname, Msgid))
|
|
|
# define ngettext(Msgid1, Msgid2, N) \
|
|
|
- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
|
|
|
+ ((N) == 1 \
|
|
|
+ ? ((void) (Msgid2), (const char *) (Msgid1)) \
|
|
|
+ : ((void) (Msgid1), (const char *) (Msgid2)))
|
|
|
# define dngettext(Domainname, Msgid1, Msgid2, N) \
|
|
|
- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
|
|
|
+ ((void) (Domainname), ngettext (Msgid1, Msgid2, N))
|
|
|
# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \
|
|
|
- ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2))
|
|
|
+ ((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N))
|
|
|
# define textdomain(Domainname) ((const char *) (Domainname))
|
|
|
-# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
|
|
|
-# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset))
|
|
|
+# define bindtextdomain(Domainname, Dirname) \
|
|
|
+ ((void) (Domainname), (const char *) (Dirname))
|
|
|
+# define bind_textdomain_codeset(Domainname, Codeset) \
|
|
|
+ ((void) (Domainname), (const char *) (Codeset))
|
|
|
|
|
|
#endif
|
|
|
|
|
|
@@ -165,7 +170,8 @@ npgettext_aux (const char *domain,
|
|
|
#include <string.h>
|
|
|
|
|
|
#define _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS \
|
|
|
- (__GNUC__ >= 3 || __GNUG__ >= 2 /* || __STDC_VERSION__ >= 199901L */ )
|
|
|
+ (((__GNUC__ >= 3 || __GNUG__ >= 2) && !__STRICT_ANSI__) \
|
|
|
+ /* || __STDC_VERSION__ >= 199901L */ )
|
|
|
|
|
|
#if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
|
|
|
#include <stdlib.h>
|