X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=env.c;h=7d03ae170a463502476d59b13bfae242fbd49a54;hb=6c0d15d2e7dfccc8b3e29384d5b86c3ea88c5153;hp=e9dfad907f7fae07a19cb524175046f0de89e834;hpb=731dfc97001b4fba470afbeed0c52af82bceeeab;p=~andy%2Ffetchmail

diff --git a/env.c b/env.c
index e9dfad90..7d03ae17 100644
--- a/env.c
+++ b/env.c
@@ -18,8 +18,8 @@
 #include "fetchmail.h"
 #include "getaddrinfo.h"
 
-#include "i18n.h"
-#if defined(HAVE_SETLOCALE) && defined(ENABLE_NLS)
+#include "gettext.h"
+#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,8 +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");
-    case P_RPOP: return("RPOP");
 #endif /* POP3_ENABLE */
 #ifdef IMAP_ENABLE
     case P_IMAP: return("IMAP");