Alexandre Julliard : wsock32: Build with msvcrt.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2490febab4dc6588968537ade50d4a1ddd74d2b1
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2490febab4dc6588968537ade50d4a1ddd74d2b1

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jun 27 21:44:56 2019 +0200

wsock32: Build with msvcrt.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wsock32/Makefile.in |  2 ++
 dlls/wsock32/protocol.c  | 25 +------------------------
 dlls/wsock32/service.c   |  2 --
 dlls/wsock32/socket.c    |  2 --
 4 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/dlls/wsock32/Makefile.in b/dlls/wsock32/Makefile.in
index b5a9c43..9a04994 100644
--- a/dlls/wsock32/Makefile.in
+++ b/dlls/wsock32/Makefile.in
@@ -2,6 +2,8 @@ MODULE    = wsock32.dll
 IMPORTLIB = wsock32
 IMPORTS   = mswsock ws2_32 iphlpapi
 
+EXTRADLLFLAGS = -mno-cygwin
+
 C_SRCS = \
 	protocol.c \
 	service.c \
diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c
index 16109e3..637d683 100644
--- a/dlls/wsock32/protocol.c
+++ b/dlls/wsock32/protocol.c
@@ -19,20 +19,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define USE_WS_PREFIX
-
-#include "config.h"
-
 #include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
 
 #include "windef.h"
 #include "winbase.h"
@@ -40,7 +27,6 @@
 #include "nspapi.h"
 
 #include "wine/debug.h"
-#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(winsock);
 
@@ -49,13 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock);
  */
 UINT WINAPI WSOCK32_inet_network(const char *cp)
 {
-#ifdef HAVE_INET_NETWORK
-    return inet_network(cp);
-#elif defined(HAVE_INET_ADDR)
     return ntohl( inet_addr( cp ) );
-#else
-    return 0;
-#endif
 }
 
 /*****************************************************************************
@@ -63,11 +43,8 @@ UINT WINAPI WSOCK32_inet_network(const char *cp)
  */
 struct netent * WINAPI WSOCK32_getnetbyname(const char *name)
 {
-#ifdef HAVE_GETNETBYNAME
-    return getnetbyname(name);
-#else
+    ERR( "%s: not supported\n", debugstr_a(name) );
     return NULL;
-#endif
 }
 
 static DWORD map_service(DWORD wsaflags)
diff --git a/dlls/wsock32/service.c b/dlls/wsock32/service.c
index 17fea61..2b6e4e7 100644
--- a/dlls/wsock32/service.c
+++ b/dlls/wsock32/service.c
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-
 #include <stdarg.h>
 
 #include "windef.h"
diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c
index 74df2e3..88ddf5b 100644
--- a/dlls/wsock32/socket.c
+++ b/dlls/wsock32/socket.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-
-#include "config.h"
 #include <stdarg.h>
 
 #include "windef.h"