X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flocalcharset.c;h=a0f7cca691879bbd6b4f14f7b2e58f11123d87a2;hb=bbdcfead98c6d3536215c3f0f603e4f92a28d26b;hp=7a2cdceb165709534355d7c7439d0d5652501c22;hpb=fc5d768acab9a39f19f24ab5c6ce41d65d35cc35;p=gnulib.git

diff --git a/lib/localcharset.c b/lib/localcharset.c
index 7a2cdceb1..a0f7cca69 100644
--- a/lib/localcharset.c
+++ b/lib/localcharset.c
@@ -18,9 +18,7 @@
 
 /* Written by Bruno Haible <bruno@clisp.org>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Specification.  */
 #include "localcharset.h"
@@ -43,7 +41,7 @@
 # if HAVE_LANGINFO_CODESET
 #  include <langinfo.h>
 # else
-#  if HAVE_SETLOCALE
+#  if 0 /* see comment below */
 #   include <locale.h>
 #  endif
 # endif
@@ -353,7 +351,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')