Repository navigation
Commit f42ce17
authored
* bpo-30726: PCbuild _elementtree: remove duplicate defines (#2348)
bpo-30726, bpo-29591: libexpat 2.2.1 of Modules/expat/ now uses
a winconfig.h configuration file which already defines:
* XML_NS
* XML_DTD
* BYTEORDER=1234
* XML_CONTEXT_BYTES=1024
* HAVE_MEMMOVE
Remove these defines from PCbuild/_elementtree.vcxproj to prevent
compiler warnings.
Co-Authored-By: Jeremy Kloth <jeremy.kloth@gmail.com>
(cherry picked from commit c8fb58b)
* bpo-30726: Fix elementtree warnings on Windows due to expat upgrade (#2319)
* bpo-30726: Fix elementtree warnings on Windows
Caused by usage of `getenv` which should be safe. And a few integer
truncations which should also be ok.
* bpo-30726: Don't ignore libexpat warnings which haypo intends to fix upstream
(cherry picked from commit 87c6555)
1 parent e2aec8e commit f42ce17
1 file changed
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -62,7 +62,7 @@ | |||
| 62 | 62 | <ItemDefinitionGroup> | |
| 63 | 63 | <ClCompile> | |
| 64 | 64 | <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>_CRT_SECURE_NO_WARNINGS;USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 66 | 66 | </ClCompile> | |
| 67 | 67 | <Link> | |
| 68 | 68 | <BaseAddress>0x1D100000</BaseAddress> | |
@@ -103,4 +103,4 @@ | |||
| 103 | 103 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | |
| 104 | 104 | <ImportGroup Label="ExtensionTargets"> | |
| 105 | 105 | </ImportGroup> | |
| 106 | - </Project> | ||
| 106 | + </Project> | ||
0 commit comments