diff options
| author | Bruno Haible <bruno@clisp.org> | 2009-05-01 14:15:37 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2009-06-23 12:16:04 +0200 |
| commit | f6bdf25a9500136567c0440a26c3e7119c6a4f49 (patch) | |
| tree | 5fbc3cffea8a97469ac44a19f0dddef08c3e4c2d /gnulib-local/lib | |
| parent | 0d4b5a06f2dbc874f88a72cbad68ff34878efbcf (diff) | |
| download | external_gettext-f6bdf25a9500136567c0440a26c3e7119c6a4f49.zip external_gettext-f6bdf25a9500136567c0440a26c3e7119c6a4f49.tar.gz external_gettext-f6bdf25a9500136567c0440a26c3e7119c6a4f49.tar.bz2 | |
Avoid compiler warnings when redefining macros defined by <libintl.h>.
Diffstat (limited to 'gnulib-local/lib')
| -rw-r--r-- | gnulib-local/lib/gettext.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/gnulib-local/lib/gettext.h b/gnulib-local/lib/gettext.h index 94c76d0..8a729ce 100644 --- a/gnulib-local/lib/gettext.h +++ b/gnulib-local/lib/gettext.h @@ -1,5 +1,5 @@ /* Convenience header for conditional use of GNU <libintl.h>. - Copyright (C) 1995-1998, 2000-2002, 2004-2006 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009 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 @@ -64,21 +64,30 @@ for invalid uses of the value returned from these functions. On pre-ANSI systems without 'const', the config.h file is supposed to contain "#define const". */ +# undef gettext # define gettext(Msgid) ((const char *) (Msgid)) +# undef dgettext # define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid)) +# undef dcgettext # define dcgettext(Domainname, Msgid, Category) \ ((void) (Category), dgettext (Domainname, Msgid)) +# undef ngettext # define ngettext(Msgid1, Msgid2, N) \ ((N) == 1 \ ? ((void) (Msgid2), (const char *) (Msgid1)) \ : ((void) (Msgid1), (const char *) (Msgid2))) +# undef dngettext # define dngettext(Domainname, Msgid1, Msgid2, N) \ ((void) (Domainname), ngettext (Msgid1, Msgid2, N)) +# undef dcngettext # define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ ((void) (Category), dngettext(Domainname, Msgid1, Msgid2, N)) +# undef textdomain # define textdomain(Domainname) ((const char *) (Domainname)) +# undef bindtextdomain # define bindtextdomain(Domainname, Dirname) \ ((void) (Domainname), (const char *) (Dirname)) +# undef bind_textdomain_codeset # define bind_textdomain_codeset(Domainname, Codeset) \ ((void) (Domainname), (const char *) (Codeset)) |