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)

diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 13354d022ca627f67524d6fddcd62fdbf5481fbf..e9568315d4f4b49b181e09f977103ea51762030d 100644 (file)
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -5230,8 +5230,12 @@ init_socket(void)
        PyModule_AddIntConstant(m, "RCVALL_OFF", RCVALL_OFF);
        PyModule_AddIntConstant(m, "RCVALL_ON", RCVALL_ON);
        PyModule_AddIntConstant(m, "RCVALL_SOCKETLEVELONLY", RCVALL_SOCKETLEVELONLY);
+#ifdef RCVALL_IPLEVEL
        PyModule_AddIntConstant(m, "RCVALL_IPLEVEL", RCVALL_IPLEVEL);
+#endif
+#ifdef RCVALL_MAX
        PyModule_AddIntConstant(m, "RCVALL_MAX", RCVALL_MAX);
+#endif
 #endif /* _MSTCPIP_ */
 
        /* Initialize gethostbyname lock */

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 0f4f9d2a52fbe8d5030aed5181aa673da2364e18..7c929ef7d77d1f29c84b4c055564dc84a73207f3 100644 (file)
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -133,6 +133,10 @@ SOURCE=..\..\Modules\_csv.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\_fileio.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\_functoolsmodule.c\r
 # End Source File\r
 # Begin Source File\r
@@ -229,6 +233,14 @@ SOURCE=..\..\Objects\bufferobject.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Objects\bytesobject.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\Objects\bytes_methods.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Objects\cellobject.c\r
 # End Source File\r
 # Begin Source File\r
@@ -357,6 +369,10 @@ SOURCE=..\..\Python\future.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\future_builtins.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\gcmodule.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/PC/VS7.1/_elementtree.vcproj b/PC/VS7.1/_elementtree.vcproj
index 63301d7f1c3ce92aeb9da342765b330233e16265..ede703e0b80a35b9badf8f46d19f39dfdcc67ecd 100644 (file)
--- 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 3a901443c0e5d22fed253e122e954255ce57b469..b1fba082e3f239d15616ddd708e9bc152028299c 100644 (file)
--- 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 ed075f5cac95333a345213a4f3b4ffb4878cb059..5c6c9c5bb861077ad58a9950b0614e92a0b68de1 100644 (file)
--- 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 3c26b5beca9b8dbd3c33bc470df17c34dff2f7c5..c875d3f4248768d1fd13c1356d42a96e565525e1 100644 (file)
--- 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 4c7b8f733b0d75914647d2b8d8079929b2fc7270..b3f046fa57388abce81de272b2b4a9263fcf4caa 100644 (file)
--- 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 a637ce2ea3e17eed5e5a150504419b2f016c2351..5e847837e5c043161a1391a4fc661512355d6b09 100644 (file)
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -367,6 +367,9 @@
                <File
                        RelativePath="..\..\Modules\_csv.c">
                </File>
+               <File
+                       RelativePath="..\..\Modules\_fileio.c">
+               </File>
                <File
                        RelativePath="..\..\Modules\_functoolsmodule.c">
                </File>
@@ -436,6 +439,12 @@
                <File
                        RelativePath="..\..\Objects\bufferobject.c">
                </File>
+               <File
+                       RelativePath="..\..\Objects\bytesobject.c">
+               </File>
+               <File
+                       RelativePath="..\..\Objects\bytes_methods.c">
+               </File>
                <File
                        RelativePath="..\..\Objects\cellobject.c">
                </File>
@@ -532,6 +541,9 @@
                <File
                        RelativePath="..\..\Python\future.c">
                </File>
+               <File
+                       RelativePath="..\..\Modules\future_builtins.c">
+               </File>
                <File
                        RelativePath="..\..\Modules\gcmodule.c">
                </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">

diff --git a/PC/VS8.0/_elementtree.vcproj b/PC/VS8.0/_elementtree.vcproj
index 32fac0c75476cfc1c13123126a33355484e2d09b..457da72f04d253fed6363b81db5e4767a88e770d 100644 (file)
--- a/PC/VS8.0/_elementtree.vcproj
+++ b/PC/VS8.0/_elementtree.vcproj
@@ -56,7 +56,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
@@ -119,7 +118,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
@@ -182,7 +180,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
@@ -246,7 +243,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
@@ -309,7 +305,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
@@ -373,7 +368,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                                TargetMachine="17"\r
                        />\r
@@ -437,7 +431,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                        />\r
                        <Tool\r
@@ -501,7 +494,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                BaseAddress="0x1D100000"\r
                                TargetMachine="17"\r
                        />\r

diff --git a/PC/VS8.0/make_versioninfo.vcproj b/PC/VS8.0/make_versioninfo.vcproj
index b097162f790fb66e0af2228426c1b2dcd0bc28b4..9dbf10d95a3ee43cc2fbbd2743b2321e6fef5c95 100644 (file)
--- a/PC/VS8.0/make_versioninfo.vcproj
+++ b/PC/VS8.0/make_versioninfo.vcproj
@@ -67,7 +67,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(SolutionDir)make_versioninfo.exe"\r
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"\r
                                SubSystem="1"\r
@@ -211,7 +210,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(SolutionDir)make_versioninfo_d.exe"\r
                                ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"\r
                                SubSystem="1"\r

diff --git a/PC/VS8.0/python.vcproj b/PC/VS8.0/python.vcproj
index 7d10e1446dea3e3b151aec16de1283b839d38eb5..bea03767def405606034407e9cdd0b4c7d30f16a 100644 (file)
--- a/PC/VS8.0/python.vcproj
+++ b/PC/VS8.0/python.vcproj
@@ -62,7 +62,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
@@ -136,7 +135,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
@@ -211,7 +209,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python_d.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
@@ -287,7 +284,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python_d.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
@@ -360,7 +356,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
@@ -435,7 +430,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
@@ -510,7 +504,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r
@@ -585,7 +578,6 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="odbccp32.lib"\r
                                OutputFile="$(OutDir)\python.exe"\r
                                SubSystem="1"\r
                                StackReserveSize="2000000"\r

diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index 2bbfec485aad1fbf7ecc355dbe162df06591d58d..e2ce1f8056ed81c9df03dbdd6d9787d6ce50af6d 100644 (file)
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -654,6 +654,14 @@
                                RelativePath="..\..\Include\bufferobject.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\bytesobject.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Include\bytes_methods.h"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\Include\cellobject.h"\r
                                >\r
@@ -978,6 +986,10 @@
                                RelativePath="..\..\Modules\_csv.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_fileio.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\Modules\_functoolsmodule.c"\r
                                >\r
@@ -1050,6 +1062,10 @@
                                RelativePath="..\..\Modules\errnomodule.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\future_builtins.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\Modules\gcmodule.c"\r
                                >\r
@@ -1342,6 +1358,14 @@
                                RelativePath="..\..\Objects\bufferobject.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\bytesobject.c"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Objects\bytes_methods.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\Objects\cellobject.c"\r
                                >\r
@@ -1627,11 +1651,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Python\formatter_string.c"\r
+                               RelativePath="..\..\Python\formatter_string.c"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\Python\formatter_unicode.c"\r
+                               RelativePath="..\..\Python\formatter_unicode.c"\r
                                >\r
                        </File>\r
                        <File\r

diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index 1892cf1ea5868e9ea046ef4a5854c49376512830..a170e771c40feaaf321d6cc54fd4a466c42e8916 100644 (file)
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -162,9 +162,15 @@ WIN32 is still required for the locale module.
 #define Py_NTDDI NTDDI_WINXP
 #else
 /* Python 2.6+ requires Windows 2000 or greater */
+#ifdef _WIN32_WINNT_WIN2K
 #define Py_WINVER _WIN32_WINNT_WIN2K
+#else
+#define Py_WINVER 0x0500
+#endif
+#ifdef NTDDI_WIN2KSP4
 #define Py_NTDDI NTDDI_WIN2KSP4
 #endif
+#endif
 
 /* We only set these values when building Python - we don't want to force
    these values on extensions, as that will affect the prototypes and