X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=env.c;h=7d03ae170a463502476d59b13bfae242fbd49a54;hb=a23a8cf8ee1da51c4392b9f52e6b72b0c01e3b5e;hp=48007f2a6bce34f50c612a67888b7dfda4b2fc88;hpb=62a673b11f3fa98e06ae3159618c8540dfb3c595;p=~andy%2Ffetchmail

diff --git a/env.c b/env.c
index 48007f2a..7d03ae17 100644
--- 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);
@@ -243,7 +243,6 @@ const char *showproto(int proto)
     case P_AUTO: return("auto");
 #ifdef POP3_ENABLE
     case P_POP3: return("POP3");
-    case P_APOP: return("APOP");
 #endif /* POP3_ENABLE */
 #ifdef IMAP_ENABLE
     case P_IMAP: return("IMAP");