8000 [3.4] bpo-31170: Fix inclusion of expat in Windows build projects (#3… · python/cpython@8b11e8d · GitHub
[go: up one dir, main page]
Skip to content

Commit 8b11e8d

Browse files
vstinnerlarryhastings
vstinner
authored and
larryhastings
committed
[3.4] bpo-31170: Fix inclusion of expat in Windows build projects (#3785)
* bpo-31170: Fix inclusion of expat in Windows build projects Co-Authored-By: Steve Dower <steve.dower@microsoft.com> * expat: Fix compilation on Visual Studio 2010 The standard header stdbool.h is not available with old Visual Studio compilers Cherry-picked from libexpat commit b4b89c2ab0cc5325a41360c25ef9d2ccbe617e5c. expat: Add artificial scopes in xmltok.c utf8_toUtf8() to fix c89 compilation. Cherry-picked from libexpat commit e0b290eb3d8f4c4b45137a7d7f4f8db812145bd2 * Expat: fix preprocessor defines in VS projects Remove the following defines: * BYTEORDER=1234 * HAVE_MEMMOVE * USE_PYEXPAT_CAPI * XML_CONTEXT_BYTES=1024 * XML_DTD * XML_NS * XML_STATIC * PCbuild/pyexpat.vcxproj: define _CRT_SECURE_NO_WARNINGS
1 parent 5d7fc42 commit 8b11e8d

File tree

7 files changed

+70
-43
lines changed

7 files changed

+70
-43
lines changed

‎Modules/expat/xmltok.c

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,18 @@
3131
*/
3232

3333
#include <stddef.h>
34-
#include <stdbool.h>
3534
#include <string.h> // memcpy
3635

36+
#if defined(_MSC_VER) && (_MSC_VER <= 1700)
37+
/* for vs2012/11.0/1700 and earlier Visual Studio compilers */
38+
# define bool int
39+
# define false 0
40+
# define true 1
41+
#else
42+
# include <stdbool.h>
43+
#endif
44+
45+
3746
#ifdef _WIN32
3847
#include "winconfig.h"
3948
#else
@@ -405,16 +414,20 @@ utf8_toUtf8(const ENCODING *UNUSED_P(enc),
405414
}
406415

407416
/* Avoid copying partial characters (from incomplete input). */
408-
const char * const fromLimBefore = fromLim;
409-
align_limit_to_full_utf8_characters(*fromP, &fromLim);
410-
if (fromLim < fromLimBefore) {
411-
input_incomplete = true;
417+
{
418+
const char * const fromLimBefore = fromLim;
419+
align_limit_to_full_utf8_characters(*fromP, &fromLim);
420+
if (fromLim < fromLimBefore) {
421+
input_incomplete = true;
422+
}
412423
}
413424

414-
const ptrdiff_t bytesToCopy = fromLim - *fromP;
415-
memcpy((void *)*toP, (const void *)*fromP, (size_t)bytesToCopy);
416-
*fromP += bytesToCopy;
417-
*toP += bytesToCopy;
425+
{
426+
const ptrdiff_t bytesToCopy = fromLim - *fromP;
427+
memcpy((void *)*toP, (const void *)*fromP, (size_t)bytesToCopy);
428+
*fromP += bytesToCopy;
429+
*toP += bytesToCopy;
430+
}
418431

419432
if (output_exhausted) // needs to go first
420433
return XML_CONVERT_OUTPUT_EXHAUSTED;

‎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 @@
1671 F438 67
<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="_CRT_SECURE_NO_WARNINGS;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="_CRT_SECURE_NO_WARNINGS;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="_CRT_SECURE_NO_WARNINGS;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="_CRT_SECURE_NO_WARNINGS;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="_CRT_SECURE_NO_WARNINGS;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="_CRT_SECURE_NO_WARNINGS;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="_CRT_SECURE_NO_WARNINGS;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="_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;XML_STATIC"
478478
/>
479479
<Tool
480480
Name="VCManagedResourceCompilerTool"

‎PCbuild/_elementtree.vcxproj

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
153153
<ClCompile>
154154
<AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
155-
<PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
155+
<PreprocessorDefinitions>USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
156156
</ClCompile>
157157
<Link>
158158
<BaseAddress>0x1D100000</BaseAddress>
@@ -173,7 +173,7 @@
173173
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
174174
<ClCompile>
175175
<AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
176-
<PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
176+
<PreprocessorDefinitions>USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
177177
</ClCompile>
178178
<Link>
179179
<BaseAddress>0x1D100000</BaseAddress>
@@ -185,7 +185,7 @@
185185
</Midl>
186186
<ClCompile>
187187
<AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
188-
<PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
188+
<PreprocessorDefinitions>USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
189189
</ClCompile>
190190
<Link>
191191
<BaseAddress>0x1D100000</BaseAddress>
@@ -194,7 +194,7 @@
194194
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
195195
<ClCompile>
196196
<AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
197-
<PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
197+
<PreprocessorDefinitions>USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
198198
</ClCompile>
199199
<Link>
200200
<BaseAddress>0x1D100000</BaseAddress>
@@ -206,7 +206,7 @@
206206
</Midl>
207207
<ClCompile>
208208
<AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
209-
<PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
209+
<PreprocessorDefinitions>USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
210210
</ClCompile>
211211
<Link>
212212
<BaseAddress>0x1D100000</BaseAddress>
@@ -216,7 +216,7 @@
216216
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
217217
<ClCompile>
218218
<AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
219-
<PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
219+
<PreprocessorDefinitions>USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
220220
</ClCompile>
221221
<Link>
222222
<BaseAddress>0x1D100000</BaseAddress>
@@ -228,7 +228,7 @@
228228
</Midl>
229229
<ClCompile>
230230
<AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
231-
<PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
231+
<PreprocessorDefinitions>USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
232232
</ClCompile>
233233
<Link>
234234
<BaseAddress>0x1D100000</BaseAddress>
@@ -253,6 +253,7 @@
253253
<ClInclude Include="..\Modules\expat\xmltok.h" />
254254
</ItemGroup>
255255
<ItemGroup>
256+
<ClCompile Include="..\Modules\expat\loadlibrary.c" />
256257
<ClCompile Include="..\Modules\_elementtree.c" />
257258
<ClCompile Include="..\Modules\expat\xmlparse.c" />
258259
<ClCompile Include="..\Modules\expat\xmlrole.c" />

‎PCbuild/_elementtree.vcxproj.filters

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
<ClInclude Include="..\Modules\expat\latin1tab.h">
3434
<Filter>Header Files</Filter>
3535
</ClInclude>
36+
<ClCompile Include="..\Modules\expat\loadlibrary.c">
37+
<Filter>Source Files</Filter>
38+
</ClCompile>
3639
<ClInclude Include="..\Modules\expat\macconfig.h">
3740
<Filter>Header Files</Filter>
3841
</ClInclude>
@@ -69,4 +72,7 @@
6972
<Filter>Source Files</Filter>
7073
</ClCompile>
7174
</ItemGroup>
72-
</Project>
75+
<ItemGroup>
76+
<ResourceCompile Include="..\PC\python_nt.rc" />
77+
</ItemGroup>
78+
</Project>

‎PCbuild/pyexpat.vcxproj

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
153153
<ClCompile>
154154
<AdditionalIncludeDirectories>.\..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
155-
<PreprocessorDefinitions>PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
155+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
156156
</ClCompile>
157157
</ItemDefinitionGroup>
158158
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -161,13 +161,13 @@
161161
</Midl>
162162
<ClCompile>
163163
<AdditionalIncludeDirectories>.\..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
164-
<PreprocessorDefinitions>PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
164+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
165165
</ClCompile>
166166
</ItemDefinitionGroup>
167167
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
168168
<ClCompile>
169169
<AdditionalIncludeDirectories>.\..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
170-
<PreprocessorDefinitions>PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
170+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
171171
</ClCompile>
172172
</ItemDefinitionGroup>
173173
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -176,13 +176,13 @@
176176
</Midl>
177177
<ClCompile>
178178
<AdditionalIncludeDirectories>.\..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
179-
<PreprocessorDefinitions>PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
179+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
180180
</ClCompile>
181181
</ItemDefinitionGroup>
182182
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">
183183
<ClCompile>
184184
<AdditionalIncludeDirectories>.\..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
185-
<PreprocessorDefinitions>PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
185+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
186186
</ClCompile>
187187
</ItemDefinitionGroup>
188188
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">
@@ -191,7 +191,7 @@
191191
</Midl>
192192
<ClCompile>
193193
<AdditionalIncludeDirectories>.\..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
194-
<PreprocessorDefinitions>PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
194+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
195195
</ClCompile>
196196
<Link>
197197
<TargetMachine>MachineX64</TargetMachine>
@@ -200,7 +200,7 @@
200200
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">
201201
<ClCompile>
202202
<AdditionalIncludeDirectories>.\..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
203-
<PreprocessorDefinitions>PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
203+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
204204
</ClCompile>
205205
</ItemDefinitionGroup>
206206
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">
@@ -209,7 +209,7 @@
209209
</Midl>
210210
<ClCompile>
211211
<AdditionalIncludeDirectories>.\..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
212-
<PreprocessorDefinitions>PYEXPAT_EXPORTS;HAVE_EXPAT_H;XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
212+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;PYEXPAT_EXPORTS;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
213213
</ClCompile>
214214
<Link>
215215
<TargetMachine>MachineX64</TargetMachine>
@@ -220,6 +220,7 @@
220220
<ClInclude Include="..\Modules\expat\xmltok.h" />
221221
</ItemGroup>
222222
<ItemGroup>
223+
<ClCompile Include="..\Modules\expat\loadlibrary.c" />
223224
<ClCompile Include="..\Modules\pyexpat.c" />
224225
<ClCompile Include="..\Modules\expat\xmlparse.c" />
225226
<ClCompile Include="..\Modules\expat\xmlrole.c" />
@@ -234,4 +235,4 @@
234235
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
235236
<ImportGroup Label="ExtensionTargets">
236237
</ImportGroup>
237-
</Project>
238+
</Project>

‎PCbuild/pyexpat.vcxproj.filters

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
</ClInclude>
1818
</ItemGroup>
1919
<ItemGroup>
20+
<ClCompile Include="..\Modules\expat\loadlibrary.c">
21+
<Filter>Source Files</Filter>
22+
</ClCompile>
2023
<ClCompile Include="..\Modules\pyexpat.c">
2124
<Filter>Source Files</Filter>
2225
</ClCompile>
@@ -30,4 +33,7 @@
3033
<Filter>Source Files</Filter>
3134
</ClCompile>
3235
</ItemGroup>
33-
</Project>
36+
<ItemGroup>
37+
<ResourceCompile Include="..\PC\python_nt.rc" />
38+
</ItemGroup>
39+
</Project>

0 commit comments

Comments
 (0)
0