diff options
| author | Bruno Haible <bruno@clisp.org> | 2001-03-11 18:15:14 +0000 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2001-03-11 18:15:14 +0000 |
| commit | 4854d244eb65a6d003bab3f95320a59f5417de90 (patch) | |
| tree | b794720eeeb574e89edac4545c7e4bc9d9b72e66 | |
| parent | eac5d44a642d1ac86c5926dd7c054fec149382db (diff) | |
| download | external_gettext-4854d244eb65a6d003bab3f95320a59f5417de90.zip external_gettext-4854d244eb65a6d003bab3f95320a59f5417de90.tar.gz external_gettext-4854d244eb65a6d003bab3f95320a59f5417de90.tar.bz2 | |
Avoid warnings on Solaris.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/gettext.c | 1 | ||||
| -rw-r--r-- | tests/ChangeLog | 5 | ||||
| -rw-r--r-- | tests/plural-1-prg.c | 3 |
4 files changed, 13 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 28a822c..802aa4f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,4 +1,9 @@ 2001-03-11 Bruno Haible <haible@clisp.cons.org> + + * gettext.c: Force inclusion of libgnuintl.h. On Solaris, <locale.h> + has already included libintl.h. + +2001-03-11 Bruno Haible <haible@clisp.cons.org> Karl Eichwalder <ke@suse.de> * po.c (po_callback_message): Add comments to support translators. diff --git a/src/gettext.c b/src/gettext.c index 52221f2..ae58597 100644 --- a/src/gettext.c +++ b/src/gettext.c @@ -34,6 +34,7 @@ # define bindtextdomain bindtextdomain__ # define gettext gettext__ # define dgettext dgettext__ +# undef _LIBINTL_H # include "libgnuintl.h" #else # include "libgettext.h" diff --git a/tests/ChangeLog b/tests/ChangeLog index f43bde1..aff8934 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2001-03-11 Bruno Haible <haible@clisp.cons.org> + + * plural-1-prg.c: Force inclusion of libgnuintl.h. On Solaris, + <locale.h> has already included libintl.h. + 2001-03-10 Bruno Haible <haible@clisp.cons.org> * msgcmp-2: Expect a singular error message. diff --git a/tests/plural-1-prg.c b/tests/plural-1-prg.c index 37beec6..e7bc501 100644 --- a/tests/plural-1-prg.c +++ b/tests/plural-1-prg.c @@ -12,7 +12,8 @@ #define textdomain textdomain__ #define bindtextdomain bindtextdomain__ #define ngettext ngettext__ -#include <libgnuintl.h> +#undef _LIBINTL_H +#include "libgnuintl.h" int main (argc, argv) int argc; |