Skip to content

C
cpython
Kaydet (Commit) 94eba715 authored tarafından Amaury Forgeot d'Arc's avatar Amaury Forgeot d'Arc
Dosyalara gözat
Seçenekler

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)
üst 41cf50d6
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 40 deletions
Modules/socketmodule.c
Dosyayı görüntüle @ 94eba715
......@@ -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 */
......
PC/VC6/pythoncore.dsp
Dosyayı görüntüle @ 94eba715
......@@ -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
......
PC/VS7.1/_elementtree.vcproj
Dosyayı görüntüle @ 94eba715
......@@ -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"
......
PC/VS7.1/_tkinter.vcproj
Dosyayı görüntüle @ 94eba715
......@@ -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"
......
PC/VS7.1/make_versioninfo.vcproj
Dosyayı görüntüle @ 94eba715
......@@ -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"
......
PC/VS7.1/pyexpat.vcproj
Dosyayı görüntüle @ 94eba715
......@@ -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"
......
PC/VS7.1/python.vcproj
Dosyayı görüntüle @ 94eba715
......@@ -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"
......
PC/VS7.1/pythoncore.vcproj
Dosyayı görüntüle @ 94eba715
......@@ -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">
......
PC/VS8.0/_elementtree.vcproj
Dosyayı görüntüle @ 94eba715
......@@ -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"
/>
......
PC/VS8.0/make_versioninfo.vcproj
Dosyayı görüntüle @ 94eba715
......@@ -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"
......
PC/VS8.0/python.vcproj
Dosyayı görüntüle @ 94eba715
......@@ -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"
......
PC/VS8.0/pythoncore.vcproj
Dosyayı görüntüle @ 94eba715
......@@ -654,6 +654,14 @@
RelativePath="..\..\Include\bufferobject.h"
>
</File>
<File
RelativePath="..\..\Include\bytesobject.h"
>
</File>
<File
RelativePath="..\..\Include\bytes_methods.h"
>
</File>
<File
RelativePath="..\..\Include\cellobject.h"
>
......@@ -978,6 +986,10 @@
RelativePath="..\..\Modules\_csv.c"
>
</File>
<File
RelativePath="..\..\Modules\_fileio.c"
>
</File>
<File
RelativePath="..\..\Modules\_functoolsmodule.c"
>
......@@ -1050,6 +1062,10 @@
RelativePath="..\..\Modules\errnomodule.c"
>
</File>
<File
RelativePath="..\..\Modules\future_builtins.c"
>
</File>
<File
RelativePath="..\..\Modules\gcmodule.c"
>
......@@ -1342,6 +1358,14 @@
RelativePath="..\..\Objects\bufferobject.c"
>
</File>
<File
RelativePath="..\..\Objects\bytesobject.c"
>
</File>
<File
RelativePath="..\..\Objects\bytes_methods.c"
>
</File>
<File
RelativePath="..\..\Objects\cellobject.c"
>
......@@ -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
......
PC/pyconfig.h
Dosyayı görüntüle @ 94eba715
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment