From: Jim Meyering <jim@meyering.net>
Date: Sat, 20 Jul 2002 06:31:12 +0000 (+0000)
Subject: Upgrade to gettext-0.11.3.
X-Git-Tag: FILEUTILS-4_1_10~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2200bd0564318b539bfa7a0cca120131cfd0c1a8;p=thirdparty%2Fcoreutils.git

Upgrade to gettext-0.11.3.
---

diff --git a/lib/gettext.h b/lib/gettext.h
index babce049f1..6d2d4f8ea1 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.