summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-03-28 21:55:29 (GMT)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>2008-03-28 21:55:29 (GMT)
commit94eba715add289a023b26132289ec00e5b7669c9 (patch)
tree08937f9c7e9b7291d5f59bf17ef979ac9336046f
parent41cf50d613f90fa5a2c243b6ecd8d50f302f3f50 (diff)
downloadcpython-94eba715add289a023b26132289ec00e5b7669c9.zip
cpython-94eba715add289a023b26132289ec00e5b7669c9.tar.gz
cpython-94eba715add289a023b26132289ec00e5b7669c9.tar.bz2
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)
Diffstat
-rw-r--r--Modules/socketmodule.c4
-rw-r--r--PC/VC6/pythoncore.dsp16
-rw-r--r--PC/VS7.1/_elementtree.vcproj4
-rw-r--r--PC/VS7.1/_tkinter.vcproj8
-rw-r--r--PC/VS7.1/make_versioninfo.vcproj2
-rw-r--r--PC/VS7.1/pyexpat.vcproj4
-rw-r--r--PC/VS7.1/python.vcproj4
-rw-r--r--PC/VS7.1/pythoncore.vcproj15
-rw-r--r--PC/VS8.0/_elementtree.vcproj8
-rw-r--r--PC/VS8.0/make_versioninfo.vcproj2
-rw-r--r--PC/VS8.0/python.vcproj8
-rw-r--r--PC/VS8.0/pythoncore.vcproj28
-rw-r--r--PC/pyconfig.h6
13 files changed, 69 insertions, 40 deletions
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 13354d0..e956831 100644
--- 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 0f4f9d2..7c929ef 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -133,6 +133,10 @@ SOURCE=..\..\Modules\_csv.c
# End Source File
# Begin Source File
+SOURCE=..\..\Modules\_fileio.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Modules\_functoolsmodule.c
# End Source File
# Begin Source File
@@ -229,6 +233,14 @@ SOURCE=..\..\Objects\bufferobject.c
# End Source File
# Begin Source File
+SOURCE=..\..\Objects\bytesobject.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Objects\bytes_methods.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Objects\cellobject.c
# End Source File
# Begin Source File
@@ -357,6 +369,10 @@ SOURCE=..\..\Python\future.c
# End Source File
# Begin Source File
+SOURCE=..\..\Modules\future_builtins.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Modules\gcmodule.c
# End Source File
# Begin Source File
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">
diff --git a/PC/VS8.0/_elementtree.vcproj b/PC/VS8.0/_elementtree.vcproj
index 32fac0c..457da72 100644
--- a/PC/VS8.0/_elementtree.vcproj
+++ b/PC/VS8.0/_elementtree.vcproj
@@ -56,7 +56,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -119,7 +118,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -182,7 +180,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -246,7 +243,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -309,7 +305,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -373,7 +368,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
TargetMachine="17"
/>
@@ -437,7 +431,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
/>
<Tool
@@ -501,7 +494,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
BaseAddress="0x1D100000"
TargetMachine="17"
/>
diff --git a/PC/VS8.0/make_versioninfo.vcproj b/PC/VS8.0/make_versioninfo.vcproj
index b097162..9dbf10d 100644
--- a/PC/VS8.0/make_versioninfo.vcproj
+++ b/PC/VS8.0/make_versioninfo.vcproj
@@ -67,7 +67,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(SolutionDir)make_versioninfo.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
@@ -211,7 +210,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(SolutionDir)make_versioninfo_d.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
diff --git a/PC/VS8.0/python.vcproj b/PC/VS8.0/python.vcproj
index 7d10e14..bea0376 100644
--- a/PC/VS8.0/python.vcproj
+++ b/PC/VS8.0/python.vcproj
@@ -62,7 +62,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -136,7 +135,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -211,7 +209,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python_d.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -287,7 +284,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python_d.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -360,7 +356,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -435,7 +430,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -510,7 +504,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
@@ -585,7 +578,6 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="odbccp32.lib"
OutputFile="$(OutDir)\python.exe"
SubSystem="1"
StackReserveSize="2000000"
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index 2bbfec4..e2ce1f8 100644
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -655,6 +655,14 @@
>
</File>
<File
+ RelativePath="..\..\Include\bytesobject.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\Include\bytes_methods.h"
+ >
+ </File>
+ <File
RelativePath="..\..\Include\cellobject.h"
>
</File>
@@ -979,6 +987,10 @@
>
</File>
<File
+ RelativePath="..\..\Modules\_fileio.c"
+ >
+ </File>
+ <File
RelativePath="..\..\Modules\_functoolsmodule.c"
>
</File>
@@ -1051,6 +1063,10 @@
>
</File>
<File
+ RelativePath="..\..\Modules\future_builtins.c"
+ >
+ </File>
+ <File
RelativePath="..\..\Modules\gcmodule.c"
>
</File>
@@ -1343,6 +1359,14 @@
>
</File>
<File
+ RelativePath="..\..\Objects\bytesobject.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\Objects\bytes_methods.c"
+ >
+ </File>
+ <File
RelativePath="..\..\Objects\cellobject.c"
>
</File>
@@ -1627,11 +1651,11 @@
>
</File>
<File
- RelativePath="..\Python\formatter_string.c"
+ RelativePath="..\..\Python\formatter_string.c"
>
</File>
<File
- RelativePath="..\Python\formatter_unicode.c"
+ RelativePath="..\..\Python\formatter_unicode.c"
>
</File>
<File
diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index 1892cf1..a170e77 100644
--- 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
generated by cgit v0.12 at 2024-11-25 10:41:03 (GMT)