Skip to content

Commit 94eba71

Browse files
amauryfaamauryfa
committed
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)
1 parent 41cf50d commit 94eba71

13 files changed

Lines changed: 69 additions & 40 deletions

‎Modules/socketmodule.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5230,8 +5230,12 @@ init_socket(void)
52305230
PyModule_AddIntConstant(m, "RCVALL_OFF", RCVALL_OFF);
52315231
PyModule_AddIntConstant(m, "RCVALL_ON", RCVALL_ON);
52325232
PyModule_AddIntConstant(m, "RCVALL_SOCKETLEVELONLY", RCVALL_SOCKETLEVELONLY);
5233+
#ifdef RCVALL_IPLEVEL
52335234
PyModule_AddIntConstant(m, "RCVALL_IPLEVEL", RCVALL_IPLEVEL);
5235+
#endif
5236+
#ifdef RCVALL_MAX
52345237
PyModule_AddIntConstant(m, "RCVALL_MAX", RCVALL_MAX);
5238+
#endif
52355239
#endif /* _MSTCPIP_ */
52365240

52375241
/* Initialize gethostbyname lock */

‎PC/VC6/pythoncore.dsp‎

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎PC/VS7.1/_elementtree.vcproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
Name="VCCustomBuildTool"/>
3434
<Tool
3535
Name="VCLinkerTool"
36-
AdditionalDependencies="odbccp32.lib"
3736
OutputFile="./_elementtree_d.pyd"
3837
LinkIncremental="1"
3938
SuppressStartupBanner="TRUE"
@@ -89,7 +88,6 @@
8988
Name="VCCustomBuildTool"/>
9089
<Tool
9190
Name="VCLinkerTool"
92-
AdditionalDependencies="odbccp32.lib"
9391
OutputFile="./_elementtree.pyd"
9492
LinkIncremental="1"
9593
SuppressStartupBanner="TRUE"
@@ -150,7 +148,6 @@
150148
<Tool
151149
Name="VCLinkerTool"
152150
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
153-
AdditionalDependencies="odbccp32.lib"
154151
OutputFile="./_elementtree.pyd"
155152
LinkIncremental="1"
156153
SuppressStartupBanner="TRUE"
@@ -211,7 +208,6 @@
211208
<Tool
212209
Name="VCLinkerTool"
213210
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
214-
AdditionalDependencies="odbccp32.lib"
215211
OutputFile="./_elementtree.pyd"
216212
LinkIncremental="1"
217213
SuppressStartupBanner="TRUE"

‎PC/VS7.1/_tkinter.vcproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
Name="VCCustomBuildTool"/>
3636
<Tool
3737
Name="VCLinkerTool"
38-
AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib odbccp32.lib"
38+
AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib"
3939
OutputFile="./_tkinter.pyd"
4040
LinkIncremental="1"
4141
SuppressStartupBanner="TRUE"
@@ -89,7 +89,7 @@
8989
Name="VCCustomBuildTool"/>
9090
<Tool
9191
Name="VCLinkerTool"
92-
AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib odbccp32.lib"
92+
AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib"
9393
OutputFile="./_tkinter_d.pyd"
9494
LinkIncremental="1"
9595
SuppressStartupBanner="TRUE"
@@ -151,7 +151,7 @@
151151
<Tool
152152
Name="VCLinkerTool"
153153
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
154-
AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib odbccp32.lib"
154+
AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib"
155155
OutputFile="./_tkinter.pyd"
156156
LinkIncremental="1"
157157
SuppressStartupBanner="TRUE"
@@ -213,7 +213,7 @@
213213
<Tool
214214
Name="VCLinkerTool"
215215
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
216-
AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib odbccp32.lib"
216+
AdditionalDependencies="..\..\..\tcltk\lib\tk84.lib ..\..\..\tcltk\lib\tcl84.lib"
217217
OutputFile="./_tkinter.pyd"
218218
LinkIncremental="1"
219219
SuppressStartupBanner="TRUE"

‎PC/VS7.1/make_versioninfo.vcproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
Outputs="..\..\PC\pythonnt_rc.h"/>
4141
<Tool
4242
Name="VCLinkerTool"
43-
AdditionalDependencies="odbccp32.lib"
4443
OutputFile=".\./make_versioninfo.exe"
4544
LinkIncremental="1"
4645
SuppressStartupBanner="TRUE"
@@ -98,7 +97,6 @@
9897
Outputs="..\..\PC\pythonnt_rc_d.h"/>
9998
<Tool
10099
Name="VCLinkerTool"
101-
AdditionalDependencies="odbccp32.lib"
102100
OutputFile="./make_versioninfo_d.exe"
103101
LinkIncremental="1"
104102
SuppressStartupBanner="TRUE"

‎PC/VS7.1/pyexpat.vcproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
Name="VCCustomBuildTool"/>
3333
<Tool
3434
Name="VCLinkerTool"
35-
AdditionalDependencies="odbccp32.lib"
3635
OutputFile="./pyexpat_d.pyd"
3736
LinkIncremental="1"
3837
SuppressStartupBanner="TRUE"
@@ -88,7 +87,6 @@
8887
Name="VCCustomBuildTool"/>
8988
<Tool
9089
Name="VCLinkerTool"
91-
AdditionalDependencies="odbccp32.lib"
9290
OutputFile="./pyexpat.pyd"
9391
LinkIncremental="1"
9492
SuppressStartupBanner="TRUE"
@@ -149,7 +147,6 @@
149147
<Tool
150148
Name="VCLinkerTool"
151149
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK"
152-
AdditionalDependencies="odbccp32.lib"
153150
OutputFile="./pyexpat.pyd"
154151
LinkIncremental="1"
155152
SuppressStartupBanner="TRUE"
@@ -210,7 +207,6 @@
210207
<Tool
211208
Name="VCLinkerTool"
212209
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
213-
AdditionalDependencies="odbccp32.lib"
214210
OutputFile="./pyexpat.pyd"
215211
LinkIncremental="1"
216212
SuppressStartupBanner="TRUE"

‎PC/VS7.1/python.vcproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
Name="VCCustomBuildTool"/>
3737
<Tool
3838
Name="VCLinkerTool"
39-
AdditionalDependencies="odbccp32.lib"
4039
OutputFile=".\./python.exe"
4140
LinkIncremental="1"
4241
SuppressStartupBanner="TRUE"
@@ -93,7 +92,6 @@
9392
Name="VCCustomBuildTool"/>
9493
<Tool
9594
Name="VCLinkerTool"
96-
AdditionalDependencies="odbccp32.lib"
9795
OutputFile="./python_d.exe"
9896
LinkIncremental="1"
9997
SuppressStartupBanner="TRUE"
@@ -158,7 +156,6 @@
158156
<Tool
159157
Name="VCLinkerTool"
160158
AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK /VSEXTCOMP_VERBOSE"
161-
AdditionalDependencies="odbccp32.lib"
162159
OutputFile=".\./python.exe"
163160
LinkIncremental="1"
164161
SuppressStartupBanner="TRUE"
@@ -222,7 +219,6 @@
222219
<Tool
223220
Name="VCLinkerTool"
224221
AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK"
225-
AdditionalDependencies="odbccp32.lib"
226222
OutputFile=".\./python.exe"
227223
LinkIncremental="1"
228224
SuppressStartupBanner="TRUE"

‎PC/VS7.1/pythoncore.vcproj‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,9 @@
367367
<File
368368
RelativePath="..\..\Modules\_csv.c">
369369
</File>
370+
<File
371+
RelativePath="..\..\Modules\_fileio.c">
372+
</File>
370373
<File
371374
RelativePath="..\..\Modules\_functoolsmodule.c">
372375
</File>
@@ -436,6 +439,12 @@
436439
<File
437440
RelativePath="..\..\Objects\bufferobject.c">
438441
</File>
442+
<File
443+
RelativePath="..\..\Objects\bytesobject.c">
444+
</File>
445+
<File
446+
RelativePath="..\..\Objects\bytes_methods.c">
447+
</File>
439448
<File
440449
RelativePath="..\..\Objects\cellobject.c">
441450
</File>
@@ -532,6 +541,9 @@
532541
<File
533542
RelativePath="..\..\Python\future.c">
534543
</File>
544+
<File
545+
RelativePath="..\..\Modules\future_builtins.c">
546+
</File>
535547
<File
536548
RelativePath="..\..\Modules\gcmodule.c">
537549
</File>
@@ -707,8 +719,7 @@
707719
RelativePath="..\..\Python\pystate.c">
708720
</File>
709721
<File
710-
RelativePath="..\..\Python\pystrcmp.c"
711-
>
722+
RelativePath="..\..\Python\pystrcmp.c">
712723
</File>
713724
<File
714725
RelativePath="..\..\Python\pystrtod.c">

‎PC/VS8.0/_elementtree.vcproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
/>
5757
<Tool
5858
Name="VCLinkerTool"
59-
AdditionalDependencies="odbccp32.lib"
6059
BaseAddress="0x1D100000"
6160
/>
6261
<Tool
@@ -119,7 +118,6 @@
119118
/>
120119
<Tool
121120
Name="VCLinkerTool"
122-
AdditionalDependencies="odbccp32.lib"
123121
BaseAddress="0x1D100000"
124122
/>
125123
<Tool
@@ -182,7 +180,6 @@
182180
/>
183181
<Tool
184182
Name="VCLinkerTool"
185-
AdditionalDependencies="odbccp32.lib"
186183
BaseAddress="0x1D100000"
187184
/>
188185
<Tool
@@ -246,7 +243,6 @@
246243
/>
247244
<Tool
248245
Name="VCLinkerTool"
249-
AdditionalDependencies="odbccp32.lib"
250246
BaseAddress="0x1D100000"
251247
/>
252248
<Tool
@@ -309,7 +305,6 @@
309305
/>
310306
<Tool
311307
Name="VCLinkerTool"
312-
AdditionalDependencies="odbccp32.lib"
313308
BaseAddress="0x1D100000"
314309
/>
315310
<Tool
@@ -373,7 +368,6 @@
373368
/>
374369
<Tool
375370
Name="VCLinkerTool"
376-
AdditionalDependencies="odbccp32.lib"
377371
BaseAddress="0x1D100000"
378372
TargetMachine="17"
379373
/>
@@ -437,7 +431,6 @@
437431
/>
438432
<Tool
439433
Name="VCLinkerTool"
440-
AdditionalDependencies="odbccp32.lib"
441434
BaseAddress="0x1D100000"
442435
/>
443436
<Tool
@@ -501,7 +494,6 @@
501494
/>
502495
<Tool
503496
Name="VCLinkerTool"
504-
AdditionalDependencies="odbccp32.lib"
505497
BaseAddress="0x1D100000"
506498
TargetMachine="17"
507499
/>

‎PC/VS8.0/make_versioninfo.vcproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
/>
6868
<Tool
6969
Name="VCLinkerTool"
70-
AdditionalDependencies="odbccp32.lib"
7170
OutputFile="$(SolutionDir)make_versioninfo.exe"
7271
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
7372
SubSystem="1"
@@ -211,7 +210,6 @@
211210
/>
212211
<Tool
213212
Name="VCLinkerTool"
214-
AdditionalDependencies="odbccp32.lib"
215213
OutputFile="$(SolutionDir)make_versioninfo_d.exe"
216214
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
217215
SubSystem="1"

0 commit comments

Comments
 (0)