Do not check HAVE_SETLOCALE.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index 8ed79f951dc2e434540a4c64d130597302ce68d4..3449ed1e8afe2287ec92e0f2174c0bc6918de2c1 100644 (file)
--- 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 73f7cc6455b312943a2a073ace809b8928b46b35..e796ae71c5dac9140a88ec7b90138c3c9dfd6e17 100644 (file)
--- 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')