include: Define _WINSOCKAPI_ in winsock2.h.

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"

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"

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>

include/winsock2.h

@@ -102,6 +102,7 @@
 
 #ifndef _WINSOCK2API_
 #define _WINSOCK2API_
+#define _WINSOCKAPI_
 
 #include <windows.h>
 

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) {