Drop HAVE_SETLOCALE check.

diff --git a/env.c b/env.c
index 48007f2a6bce34f50c612a67888b7dfda4b2fc88..cf535e34eb8b9944405c8f09fc8836013b66db66 100644 (file)
--- a/env.c
+++ b/env.c
@@ -19,7 +19,7 @@
 #include "getaddrinfo.h"
 
 #include "gettext.h"
-#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS)
+#if defined(ENABLE_NLS)
 #include <locale.h>
 #endif
 
@@ -223,12 +223,12 @@ char *rfc822timestamp(void)
      * weird multibyte i18n characters (such as kanji) from showing up
      * in your Received headers.
      */
-#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS)
+#if defined(ENABLE_NLS)
     setlocale (LC_TIME, "C");
 #endif
     strftime(buf, sizeof(buf)-1, 
             "%a, %d %b %Y %H:%M:%S XXXXX (%Z)", localtime(&now));
-#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS)
+#if defined(ENABLE_NLS)
     setlocale (LC_TIME, "");
 #endif
     strncpy(strstr(buf, "XXXXX"), tzoffset(&now), 5);

diff --git a/fetchmail.c b/fetchmail.c
index 30ff4f9861a181cf68bc3a795b5b9c08f6dc3874..eea82814356d762ec44a28fbfbe5c8bbdb88716f 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -98,8 +98,8 @@ static void dropprivs(void)
 }
 #endif
 
-#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS)
 #include <locale.h>
+#if defined(ENABLE_NLS)
 /** returns timestamp in current locale,
  * and resets LC_TIME locale to POSIX. */
 static char *timestamp (void)