From: Bruno Haible <bruno@clisp.org>
Date: Fri, 10 May 2002 11:33:37 +0000 (+0000)
Subject: Fix a compilation error if <locale.h> is included after gettext.h on Solaris
X-Git-Tag: v0.11.3~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b5a38d2c59b2c528987a83ee8785243c2db60c4;p=thirdparty%2Fgettext.git

Fix a compilation error if <locale.h> is included after gettext.h on Solaris
with --disable-nls.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 835e19be3..37e9931fb 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-10  Bruno Haible  <bruno@clisp.org>
+
+	* gettext.h: On Solaris, include <locale.h>.
+
 2002-05-04  Bruno Haible  <bruno@clisp.org>
 
 	* javacomp.c (compile_java_class): Ignore non-digits in the first
diff --git a/lib/gettext.h b/lib/gettext.h
index ea67f3081..8b262f4cf 100644
--- a/lib/gettext.h
+++ b/lib/gettext.h
@@ -27,6 +27,16 @@
 
 #else
 
+/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which
+   chokes if dcgettext is defined as a macro.  So include it now, to make
+   later inclusions of <locale.h> a NOP.  We don't include <libintl.h>
+   as well because people using "gettext.h" will not include <libintl.h>,
+   and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
+   is OK.  */
+#if defined(__sun)
+# include <locale.h>
+#endif
+
 /* Disabled NLS.
    The casts to 'const char *' serve the purpose of producing warnings
    for invalid uses of the value returned from these functions.