X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=servport.c;h=a775c9c93f2562070be1d4a5da2bb07145b25c28;hb=40fe452223b5cc0ff5dbae0efa8551d7e96c1a5c;hp=2849f7c2d766f98187647b8e66529e45f188260a;hpb=8e71aeb4c1ed10442a36d861250c23f2c3d89ce9;p=~andy%2Ffetchmail

diff --git a/servport.c b/servport.c
index 2849f7c2..a775c9c9 100644
--- 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) {
@@ -48,7 +44,7 @@ int servport(const char *service) {
 	hints.ai_family = AF_UNSPEC;
 	hints.ai_socktype = SOCK_STREAM;
 	hints.ai_protocol = IPPROTO_TCP;
-	e = getaddrinfo(NULL, service, &hints, &res);
+	e = fm_getaddrinfo(NULL, service, &hints, &res);
 	if (e) {
 	    report(stderr, GT_("getaddrinfo(NULL, \"%s\") error: %s\n"),
 		    service, gai_strerror(e));
@@ -64,10 +60,10 @@ int servport(const char *service) {
 		break;
 #endif
 		default:
-		    freeaddrinfo(res);
+		    fm_freeaddrinfo(res);
 		    goto err;
 	    }
-	    freeaddrinfo(res);
+	    fm_freeaddrinfo(res);
 	}
     } else {
 	if (u == 0 || u > 65535)