Avoid warnings on Solaris.

diff --git a/src/ChangeLog b/src/ChangeLog
index 28a822cd467c7f077b5b44709a26af4c445f2caf..802aa4f5734b877dbc6558bb938dc87aca36da2f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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>
 

diff --git a/src/gettext.c b/src/gettext.c
index 52221f27a23e5ae0fcf49c303c533d0823269a2c..ae5859798e7508596e3db566377a379ebd3756a8 100644 (file)
--- 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 f43bde1c3e9f585aaa9cf79480112ed58da760d5..aff8934504ae38b84a8105921cfaf7d8362add63 100644 (file)
--- 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 37beec64c17aadb06206adc7a4fb045fc1398f7d..e7bc5013d645adb6b76602d2c2a51c16cec7f4f4 100644 (file)
--- 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;