[Python-checkins] r86136 - in python/branches/release27-maint: Modules/selectmodule.c PCbuild/select.vcproj

kristjan.jonsson python-checkins at python.org
Wed Nov 3 14:27:33 CET 2010

• Previous message: [Python-checkins] Python Regression Test Failures doc (1)
• Next message: [Python-checkins] r86137 - in python/branches/py3k/PCbuild: make_buildinfo.c make_buildinfo.vcproj pythoncore.vcproj
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

Author: kristjan.jonsson
Date: Wed Nov 3 14:27:33 2010
New Revision: 86136
Log:
issue 10295
Make selectmodule.c use winsock2 like socketmodule does.
Modified:
 python/branches/release27-maint/Modules/selectmodule.c
 python/branches/release27-maint/PCbuild/select.vcproj
Modified: python/branches/release27-maint/Modules/selectmodule.c
==============================================================================
--- python/branches/release27-maint/Modules/selectmodule.c	(original)
+++ python/branches/release27-maint/Modules/selectmodule.c	Wed Nov 3 14:27:33 2010
@@ -47,7 +47,7 @@
 #endif
 
 #ifdef MS_WINDOWS
-# include <winsock.h>
+# include <winsock2.h>
 #else
 # define SOCKET int
 # ifdef __BEOS__
Modified: python/branches/release27-maint/PCbuild/select.vcproj
==============================================================================
--- python/branches/release27-maint/PCbuild/select.vcproj	(original)
+++ python/branches/release27-maint/PCbuild/select.vcproj	Wed Nov 3 14:27:33 2010
@@ -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"

---

• Previous message: [Python-checkins] Python Regression Test Failures doc (1)
• Next message: [Python-checkins] r86137 - in python/branches/py3k/PCbuild: make_buildinfo.c make_buildinfo.vcproj pythoncore.vcproj
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

More information about the Python-checkins mailing list