From: Bruno Haible <bruno@clisp.org>
Date: Wed, 18 Oct 2006 11:56:41 +0000 (+0000)
Subject: Do not check HAVE_SETLOCALE.
X-Git-Tag: 0.16.x-branchpoint~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ee7d59b67af4f467b95b72b1c619713b7eeae3e;p=thirdparty%2Fgettext.git

Do not check HAVE_SETLOCALE.
---

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 8ed79f951..3449ed1e8 100644
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* localcharset.c: Do not check HAVE_SETLOCALE.
+
 2006-10-09  Bruno Haible  <bruno@clisp.org>
 
 	* langprefs.c: Update comment about locale name syntax.
diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c
index 73f7cc645..e796ae71c 100644
--- a/gettext-runtime/intl/localcharset.c
+++ b/gettext-runtime/intl/localcharset.c
@@ -42,7 +42,7 @@
 # if HAVE_LANGINFO_CODESET
 #  include <langinfo.h>
 # else
-#  if HAVE_SETLOCALE
+#  if 0 /* see comment below */
 #   include <locale.h>
 #  endif
 # endif
@@ -352,7 +352,7 @@ locale_charset (void)
      (like SunOS 4 or DJGPP) have only the C locale.  Therefore we don't
      use setlocale here; it would return "C" when it doesn't support the
      locale name the user has set.  */
-#  if HAVE_SETLOCALE && 0
+#  if 0
   locale = setlocale (LC_CTYPE, NULL);
 #  endif
   if (locale == NULL || locale[0] == '\0')