w32: Modernize for MinGW 6.0.0, and clean up

[empserver] / src / lib / w32 / w32sockets.c

diff --git a/src/lib/w32/w32sockets.c b/src/lib/w32/w32sockets.c
index 3d80a2dae8a4e125f258f3ad26864673f33b9ab1..f1c36ccefacad868010bd03d6b71eecd6158b651 100644 (file)
--- a/src/lib/w32/w32sockets.c
+++ b/src/lib/w32/w32sockets.c
@@ -232,43 +232,6 @@ w32_socket(int domain, int type, int protocol)
     return W32_SOCKET_TO_FD(sock);
 }
 
-#ifdef HAVE_GETADDRINFO
-const char *
-inet_ntop(int af, const void *src, char *dst, socklen_t len)
-{
-    struct sockaddr *sa;
-    struct sockaddr_in sin;
-    struct sockaddr_in6 sin6;
-    size_t salen;
-
-    if (af == AF_INET) {
-       memset(&sin, 0, sizeof(sin));
-       sin.sin_family = af;
-       memcpy(&sin.sin_addr, src, sizeof(sin.sin_addr));
-       sa = (struct sockaddr *)&sin;
-       salen = sizeof(sin);
-    } else if (af == AF_INET6) {
-       memset(&sin6, 0, sizeof(sin6));
-       sin6.sin6_family = af;
-       memcpy(&sin6.sin6_addr, src, sizeof(sin6.sin6_addr));
-       sa = (struct sockaddr *)&sin6;
-       salen = sizeof(sin6);
-    } else {
-       WSASetLastError(WSAEAFNOSUPPORT);
-       w32_set_winsock_errno();
-       return NULL;
-    }
-
-    if (getnameinfo(sa, salen, dst, len, NULL, 0, NI_NUMERICHOST)) {
-       WSASetLastError(WSAEAFNOSUPPORT);
-       w32_set_winsock_errno();
-       return NULL;
-    }
-
-    return dst;
-}
-#endif
-
 /*
  * POSIX equivalent for fcntl().
  * Horrible hacks, just good enough support Empire's use of fcntl().