Zebediah Figura : include: Define _WINSOCKAPI_ in winsock2.h.

[Alexandre Julliard]

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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Tue Apr 27 11:07:20 2021 -0500

include: Define _WINSOCKAPI_ in winsock2.h.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/shell32/tests/shlfileop.c | 1 -
 dlls/shell32/tests/string.c    | 1 -
 include/windows.h              | 3 ---
 include/winsock2.h             | 1 +
 tools/winapi/winapi_test       | 2 --
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c
index 70d90a5c7ac..726585e39a2 100644
--- a/dlls/shell32/tests/shlfileop.c
+++ b/dlls/shell32/tests/shlfileop.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 
 #define COBJMACROS
-#define WINE_NOWINSOCK
 #include <windows.h>
 #include "shellapi.h"
 #include "shlobj.h"
diff --git a/dlls/shell32/tests/string.c b/dlls/shell32/tests/string.c
index acd94448119..d1d621d9577 100644
--- a/dlls/shell32/tests/string.c
+++ b/dlls/shell32/tests/string.c
@@ -21,7 +21,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-#define WINE_NOWINSOCK
 #include "windef.h"
 #include "winbase.h"
 #include "wtypes.h"
diff --git a/include/windows.h b/include/windows.h
index ec5c6a20028..47f13e395d2 100644
--- a/include/windows.h
+++ b/include/windows.h
@@ -59,10 +59,7 @@
 #include <rpc.h>
 #include <shellapi.h>
 #include <winperf.h>
-
-#ifndef WINE_NOWINSOCK
 #include <winsock.h>
-#endif /* WINE_NOWINSOCK */
 
 #ifndef NOCRYPT
 #include <wincrypt.h>
diff --git a/include/winsock2.h b/include/winsock2.h
index 8739cedcbc6..c299583eaff 100644
--- a/include/winsock2.h
+++ b/include/winsock2.h
@@ -102,6 +102,7 @@
 
 #ifndef _WINSOCK2API_
 #define _WINSOCK2API_
+#define _WINSOCKAPI_
 
 #include <windows.h>
 
diff --git a/tools/winapi/winapi_test b/tools/winapi/winapi_test
index 716bb30ac08..b9628e85154 100755
--- a/tools/winapi/winapi_test
+++ b/tools/winapi/winapi_test
@@ -517,8 +517,6 @@ sub output_header($$$) {
     print OUT " */\n";
     print OUT "\n";
 
-    print OUT "#define WINE_NOWINSOCK\n";
-    print OUT "\n";
     foreach my $test (@tests) {
 	my @includes = $tests->get_section($test_dir, $test, "include");
 	foreach my $include (@includes) {