From: Kristján Valur Jónsson <kristjan@ccpgames.com>
Date: Wed, 3 Nov 2010 13:27:33 +0000 (+0000)
Subject: issue 10295
X-Git-Tag: v2.7.1rc1~61
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f6f3c4aa53732d4cd4254f4f02b779886f9c9cc4;p=python

issue 10295
Make selectmodule.c use winsock2 like socketmodule does.
---

diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c
index 086a6476ee..5192ce74cf 100644
--- 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 b97cb4d184..b067ad0ad2 100644
--- 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"