Skip to content

Commit ab3b0ad

Browse files
jklothvstinner
jkloth
authored and
vstinner
committed
bpo-29591: Update VS project files (#2310)
* Silence warnings caused by duplicated defines from Modules\expat\winconfig.h * Add WIN32 define to VS9.0 project files to match MSBuild project files.
1 parent 2ada64d commit ab3b0ad

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

‎PC/VS9.0/_elementtree.vcproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<Tool
4444
Name="VCCLCompilerTool"
4545
AdditionalIncludeDirectories="..\..\Modules\expat"
46-
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
46+
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
4747
/>
4848
<Tool
4949
Name="VCManagedResourceCompilerTool"
@@ -105,7 +105,7 @@
105105
<Tool
106106
Name="VCCLCompilerTool"
107107
AdditionalIncludeDirectories="..\..\Modules\expat"
108-
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
108+
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
109109
/>
110110
<Tool
111111
Name="VCManagedResourceCompilerTool"
@@ -167,7 +167,7 @@
167167
<Tool
168168
Name="VCCLCompilerTool"
169169
AdditionalIncludeDirectories="..\..\Modules\expat"
170-
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
170+
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
171171
/>
172172
<Tool
173173
Name="VCManagedResourceCompilerTool"
@@ -230,7 +230,7 @@
230230
<Tool
231231
Name="VCCLCompilerTool"
232232
AdditionalIncludeDirectories="..\..\Modules\expat"
233-
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
233+
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
234234
/>
235235
<Tool
236236
Name="VCManagedResourceCompilerTool"
@@ -292,7 +292,7 @@
292292
<Tool
293293
Name="VCCLCompilerTool"
294294
AdditionalIncludeDirectories="..\..\Modules\expat"
295-
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
295+
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
296296
/>
297297
<Tool
298298
Name="VCManagedResourceCompilerTool"
@@ -355,7 +355,7 @@
355355
<Tool
356356
Name="VCCLCompilerTool"
357357
AdditionalIncludeDirectories="..\..\Modules\expat"
358-
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
358+
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
359359
/>
360360
<Tool
361361
Name="VCManagedResourceCompilerTool"
@@ -418,7 +418,7 @@
418418
<Tool
419419
Name="VCCLCompilerTool"
420420
AdditionalIncludeDirectories="..\..\Modules\expat"
421-
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
421+
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
422422
/>
423423
<Tool
424424
Name="VCManagedResourceCompilerTool"
@@ -481,7 +481,7 @@
481481
<Tool
482482
Name="VCCLCompilerTool"
483483
AdditionalIncludeDirectories="..\..\Modules\expat"
484-
PreprocessorDefinitions="XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE"
484+
PreprocessorDefinitions="USE_PYEXPAT_CAPI;XML_STATIC"
485485
/>
486486
<Tool
487487
Name="VCManagedResourceCompilerTool"

‎PC/VS9.0/pyexpat.vcproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<Tool
4444
Name="VCCLCompilerTool"
4545
AdditionalIncludeDirectories=".\..\..\Modules\expat"
46-
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
46+
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
4747
/>
4848
<Tool
4949
Name="VCManagedResourceCompilerTool"
@@ -104,7 +104,7 @@
104104
<Tool
105105
Name="VCCLCompilerTool"
106106
AdditionalIncludeDirectories=".\..\..\Modules\expat"
107-
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
107+
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
108108
/>
109109
<Tool
110110
Name="VCManagedResourceCompilerTool"
@@ -165,7 +165,7 @@
165165
<Tool
166166
Name="VCCLCompilerTool"
167167
AdditionalIncludeDirectories=".\..\..\Modules\expat"
168-
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
168+
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
169169
/>
170170
<Tool
171171
Name="VCManagedResourceCompilerTool"
@@ -227,7 +227,7 @@
227227
<Tool
228228
Name="VCCLCompilerTool"
229229
AdditionalIncludeDirectories=".\..\..\Modules\expat"
230-
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
230+
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
231231
/>
232232
<Tool
233233
Name="VCManagedResourceCompilerTool"
@@ -288,7 +288,7 @@
288288
<Tool
289289
Name="VCCLCompilerTool"
290290
AdditionalIncludeDirectories=".\..\..\Modules\expat"
291-
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
291+
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
292292
/>
293293
<Tool
294294
Name="VCManagedResourceCompilerTool"
@@ -350,7 +350,7 @@
350350
<Tool
351351
Name="VCCLCompilerTool"
352352
AdditionalIncludeDirectories=".\..\..\Modules\expat"
353-
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
353+
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
354354
/>
355355
<Tool
356356
Name="VCManagedResourceCompilerTool"
@@ -412,7 +412,7 @@
412412
<Tool
413413
Name="VCCLCompilerTool"
414414
AdditionalIncludeDirectories=".\..\..\Modules\expat"
415-
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
415+
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
416416
/>
417417
<Tool
418418
Name="VCManagedResourceCompilerTool"
@@ -474,7 +474,7 @@
474474
<Tool
475475
Name="VCCLCompilerTool"
476476
AdditionalIncludeDirectories=".\..\..\Modules\expat"
477-
PreprocessorDefinitions="PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE"
477+
PreprocessorDefinitions="PYEXPAT_EXPORTS;XML_STATIC"
478478
/>
479479
<Tool
480480
Name="VCManagedResourceCompilerTool"

‎PC/VS9.0/pyproject.vsprops‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
InlineFunctionExpansion="1"
1313
EnableIntrinsicFunctions="true"
1414
AdditionalIncludeDirectories="..\..\Include; ..\..\PC"
15-
PreprocessorDefinitions="_WIN32"
15+
PreprocessorDefinitions="_WIN32;WIN32"
1616
StringPooling="true"
1717
ExceptionHandling="0"
1818
RuntimeLibrary="0"

‎PCbuild/_elementtree.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<ItemDefinitionGroup>
6363
<ClCompile>
6464
<AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
65-
<PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
65+
<PreprocessorDefinitions>USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6666
</ClCompile>
6767
<Link>
6868
<BaseAddress>0x1D100000</BaseAddress>

‎PCbuild/pyexpat.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<ItemDefinitionGroup>
6060
<ClCompile>
6161
<AdditionalIncludeDirectories>$(PySourcePath)Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
62-
<PreprocessorDefinitions>PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
62+
<PreprocessorDefinitions>PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6363
</ClCompile>
6464
</ItemDefinitionGroup>
6565
<ItemGroup>

0 commit comments

Comments
 (0)