Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
vstinner merged 2 commits into from
Jun 23, 2017
Merged

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

vstinner merged 2 commits into from
Jun 23, 2017

Conversation

@vstinner
Copy link
Member

@vstinner vstinner commented Jun 23, 2017

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 [email protected]
(cherry picked from commit c8fb58b)

@bedevere-bot bedevere-bot mentioned this pull request Jun 23, 2017
Merged
vstinner and others added 2 commits June 23, 2017 15:03
@vstinner @jkloth
bpo-30726: PCbuild _elementtree: remove duplicate defines (#2348)
f06651a 
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 <[email protected]>
(cherry picked from commit c8fb58b)
@segevfiner @vstinner
bpo-30726: Fix elementtree warnings on Windows due to expat upgrade (#…
38c20c1 
…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

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@vstinner @the-knights-who-say-ni @segevfiner