diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-06-23 13:14:18 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-23 13:14:18 (GMT) |
| commit | f42ce179c8aaa7e211ac4123c58fa3dd9a452004 (patch) | |
| tree | 1c5ef03ffcc68a36c2a082ea982f38c33ecc296a | |
| parent | e2aec8e691d8acb08373889d9af48a5b1d03b689 (diff) | |
| download | cpython-f42ce179c8aaa7e211ac4123c58fa3dd9a452004.zip cpython-f42ce179c8aaa7e211ac4123c58fa3dd9a452004.tar.gz cpython-f42ce179c8aaa7e211ac4123c58fa3dd9a452004.tar.bz2 | |
[3.5] bpo-30726: PCbuild _elementtree: remove duplicate defines (#2348) (#2350)
* 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 c8fb58bd7917151e63398587a7fc2126db7c26de)
* 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 87c65550730a8f85ce339ba197bce4fb7e836619)
| -rw-r--r-- | PCbuild/_elementtree.vcxproj | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj index 725b5a9..639ba47 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -62,7 +62,7 @@ <ItemDefinitionGroup> <ClCompile> <AdditionalIncludeDirectories>..\Modules\expat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>XML_NS;XML_DTD;BYTEORDER=1234;XML_CONTEXT_BYTES=1024;USE_PYEXPAT_CAPI;XML_STATIC;HAVE_MEMMOVE;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;USE_PYEXPAT_CAPI;XML_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> <Link> <BaseAddress>0x1D100000</BaseAddress> @@ -103,4 +103,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project>
\ No newline at end of file +</Project> |