From: Bruno Haible <bruno@clisp.org>
Date: Sun, 11 Mar 2001 18:15:14 +0000 (+0000)
Subject: Avoid warnings on Solaris.
X-Git-Tag: v0.10.36~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4854d244eb65a6d003bab3f95320a59f5417de90;p=thirdparty%2Fgettext.git

Avoid warnings on Solaris.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 28a822cd4..802aa4f57 100644
--- 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 52221f27a..ae5859798 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 f43bde1c3..aff893450 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 37beec64c..e7bc5013d 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;