issue 10295

Make selectmodule.c use winsock2 like socketmodule does.

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 086a6476ee84ba787dbfcdc1e7286d190b098739..5192ce74cf4fc367812b09f1bbe8d9383a75cb70 100644 (file)
--- a/Modules/selectmodule.c
+++ b/Modules/selectmodule.c
@@ -47,7 +47,7 @@ extern void bzero(void *, int);
 #endif
 
 #ifdef MS_WINDOWS
-#  include <winsock.h>
+#  include <winsock2.h>
 #else
 #  define SOCKET int
 #  ifdef __BEOS__

diff --git a/PCbuild/select.vcproj b/PCbuild/select.vcproj
index b97cb4d1842e90539cfc7331ab01a2f50d18658d..b067ad0ad276c74c4b81c8d68565aec490eec2bb 100644 (file)
--- a/PCbuild/select.vcproj
+++ b/PCbuild/select.vcproj
@@ -54,7 +54,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                IgnoreDefaultLibraryNames="libc"
                                BaseAddress="0x1D110000"
                        />
@@ -116,7 +116,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                IgnoreDefaultLibraryNames="libc"
                                BaseAddress="0x1D110000"
                        />
@@ -178,7 +178,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                IgnoreDefaultLibraryNames="libc"
                                BaseAddress="0x1D110000"
                        />
@@ -241,7 +241,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                IgnoreDefaultLibraryNames="libc"
                                BaseAddress="0x1D110000"
                        />
@@ -303,7 +303,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                IgnoreDefaultLibraryNames="libc"
                                BaseAddress="0x1D110000"
                        />
@@ -366,7 +366,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                IgnoreDefaultLibraryNames="libc"
                                BaseAddress="0x1D110000"
                                TargetMachine="17"
@@ -429,7 +429,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                IgnoreDefaultLibraryNames="libc"
                                BaseAddress="0x1D110000"
                        />
@@ -492,7 +492,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="wsock32.lib"
+                               AdditionalDependencies="ws2_32.lib"
                                IgnoreDefaultLibraryNames="libc"
                                BaseAddress="0x1D110000"
                                TargetMachine="17"