inet_ntop: fix a couple of old-style decls

diff --git a/compat/mingw.c b/compat/mingw.c
index 6590f33cc8157f61ff7b6e0f6330bacf465ad39c..701a555f13033e65cd56af33e666ca088b95dc11 100644 (file)
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -1175,7 +1175,10 @@ int mingw_getnameinfo(const struct sockaddr *sa, socklen_t salen,
 int mingw_socket(int domain, int type, int protocol)
 {
        int sockfd;
-       SOCKET s = WSASocket(domain, type, protocol, NULL, 0, 0);
+       SOCKET s;
+
+       ensure_socket_initialization();
+       s = WSASocket(domain, type, protocol, NULL, 0, 0);
        if (s == INVALID_SOCKET) {
                /*
                 * WSAGetLastError() values are regular BSD error codes
@@ -1205,6 +1208,45 @@ int mingw_connect(int sockfd, struct sockaddr *sa, size_t sz)
        return connect(s, sa, sz);
 }
 
+#undef bind
+int mingw_bind(int sockfd, struct sockaddr *sa, size_t sz)
+{
+       SOCKET s = (SOCKET)_get_osfhandle(sockfd);
+       return bind(s, sa, sz);
+}
+
+#undef setsockopt
+int mingw_setsockopt(int sockfd, int lvl, int optname, void *optval, int optlen)
+{
+       SOCKET s = (SOCKET)_get_osfhandle(sockfd);
+       return setsockopt(s, lvl, optname, (const char*)optval, optlen);
+}
+
+#undef listen
+int mingw_listen(int sockfd, int backlog)
+{
+       SOCKET s = (SOCKET)_get_osfhandle(sockfd);
+       return listen(s, backlog);
+}
+
+#undef accept
+int mingw_accept(int sockfd1, struct sockaddr *sa, socklen_t *sz)
+{
+       int sockfd2;
+
+       SOCKET s1 = (SOCKET)_get_osfhandle(sockfd1);
+       SOCKET s2 = accept(s1, sa, sz);
+
+       /* convert into a file descriptor */
+       if ((sockfd2 = _open_osfhandle(s2, O_RDWR|O_BINARY)) < 0) {
+               int err = errno;
+               closesocket(s2);
+               return error("unable to make a socket file descriptor: %s",
+                       strerror(err));
+       }
+       return sockfd2;
+}
+
 #undef rename
 int mingw_rename(const char *pold, const char *pnew)
 {