Attempt merging from 6.3.24.

[~andy/fetchmail] / servport.c

diff --git a/servport.c b/servport.c
index 0a12c640446b35dfa42e8e1405367db85784be84..a775c9c93f2562070be1d4a5da2bb07145b25c28 100644 (file)
--- a/servport.c
+++ b/servport.c
@@ -7,19 +7,15 @@
  */
 #include "fetchmail.h"
 #include "getaddrinfo.h"
-#include "i18n.h"
+#include "gettext.h"
 
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <netdb.h>
-#if defined(HAVE_NETINET_IN_H)
 #include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
-#endif
 #include <sys/socket.h>
 
 int servport(const char *service) {