Skip to content

[3.5] bpo-30726: PCbuild _elementtree: remove duplicate defines (#2348)#2350

Merged
vstinner merged 2 commits intopython:3.5from
vstinner:pcbuild_expat35
Jun 23, 2017
Merged

[3.5] bpo-30726: PCbuild _elementtree: remove duplicate defines (#2348)#2350
vstinner merged 2 commits intopython:3.5from
vstinner:pcbuild_expat35

Conversation

@vstinner
Copy link
Member

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)

vstinner and others added 2 commits June 23, 2017 15:03
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)
…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)
@vstinner vstinner merged commit f42ce17 into python:3.5 Jun 23, 2017
@vstinner vstinner deleted the pcbuild_expat35 branch June 23, 2017 13:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants