Repair compilation for Visual Studio 2005.

I applied the same changes manually to VS7.1 and VC6 files; completely untested.

(Christian, don't try too hard merging this change into py3k.
It will be easier to do the same work again on the branch)

6 files changed, 17 insertions, 20 deletions

diff --git a/PC/VS7.1/_elementtree.vcproj b/PC/VS7.1/_elementtree.vcproj
index 63301d7..ede703e 100644
--- a/PC/VS7.1/_elementtree.vcproj
+++ b/PC/VS7.1/_elementtree.vcproj
@@ -33,7 +33,6 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="./_elementtree_d.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -89,7 +88,6 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="./_elementtree.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -150,7 +148,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="./_elementtree.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -211,7 +208,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="./_elementtree.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
diff --git a/PC/VS7.1/_tkinter.vcproj b/PC/VS7.1/_tkinter.vcproj
index 3a90144..b1fba08 100644
--- a/PC/VS7.1/_tkinter.vcproj
+++ b/PC/VS7.1/_tkinter.vcproj
@@ -35,7 +35,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib odbccp32.lib"
+				AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib"
 				OutputFile="./_tkinter.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -89,7 +89,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib odbccp32.lib"
+				AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib"
 				OutputFile="./_tkinter_d.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -151,7 +151,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-				AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib odbccp32.lib"
+				AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib"
 				OutputFile="./_tkinter.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -213,7 +213,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-				AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib odbccp32.lib"
+				AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib"
 				OutputFile="./_tkinter.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
diff --git a/PC/VS7.1/make_versioninfo.vcproj b/PC/VS7.1/make_versioninfo.vcproj
index ed075f5..5c6c9c5 100644
--- a/PC/VS7.1/make_versioninfo.vcproj
+++ b/PC/VS7.1/make_versioninfo.vcproj
@@ -40,7 +40,6 @@
 				Outputs="..\..\PC\pythonnt_rc.h"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile=".\./make_versioninfo.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -98,7 +97,6 @@
 				Outputs="..\..\PC\pythonnt_rc_d.h"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="./make_versioninfo_d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
diff --git a/PC/VS7.1/pyexpat.vcproj b/PC/VS7.1/pyexpat.vcproj
index 3c26b5be..c875d3f 100644
--- a/PC/VS7.1/pyexpat.vcproj
+++ b/PC/VS7.1/pyexpat.vcproj
@@ -32,7 +32,6 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="./pyexpat_d.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -88,7 +87,6 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="./pyexpat.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -149,7 +147,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="./pyexpat.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -210,7 +207,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="./pyexpat.pyd"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
diff --git a/PC/VS7.1/python.vcproj b/PC/VS7.1/python.vcproj
index 4c7b8f7..b3f046f 100644
--- a/PC/VS7.1/python.vcproj
+++ b/PC/VS7.1/python.vcproj
@@ -36,7 +36,6 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile=".\./python.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -93,7 +92,6 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile="./python_d.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -158,7 +156,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK /VSEXTCOMP_VERBOSE"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile=".\./python.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -222,7 +219,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
-				AdditionalDependencies="odbccp32.lib"
 				OutputFile=".\./python.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index a637ce2..5e84783 100644
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -368,6 +368,9 @@
 			RelativePath="..\..\Modules\_csv.c">
 		</File>
 		<File
+			RelativePath="..\..\Modules\_fileio.c">
+		</File>
+		<File
 			RelativePath="..\..\Modules\_functoolsmodule.c">
 		</File>
 		<File
@@ -437,6 +440,12 @@
 			RelativePath="..\..\Objects\bufferobject.c">
 		</File>
 		<File
+			RelativePath="..\..\Objects\bytesobject.c">
+		</File>
+		<File
+			RelativePath="..\..\Objects\bytes_methods.c">
+		</File>
+		<File
 			RelativePath="..\..\Objects\cellobject.c">
 		</File>
 		<File
@@ -533,6 +542,9 @@
 			RelativePath="..\..\Python\future.c">
 		</File>
 		<File
+			RelativePath="..\..\Modules\future_builtins.c">
+		</File>
+		<File
 			RelativePath="..\..\Modules\gcmodule.c">
 		</File>
 		<File
@@ -707,8 +719,7 @@
 			RelativePath="..\..\Python\pystate.c">
 		</File>
 		<File
-			RelativePath="..\..\Python\pystrcmp.c"
-			>
+			RelativePath="..\..\Python\pystrcmp.c">
 		</File>
 		<File
 			RelativePath="..\..\Python\pystrtod.c">