diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-10-18 02:05:47 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-18 02:05:47 (GMT) |
| commit | 4bfecb9298d447d5599ea76f3f68f772c38b8fd0 (patch) | |
| tree | 7367d454a241697f0a0b8033a36885ed3e71989b /Modules | |
| parent | a5ebc205beea2bf1501e4ac33ed6e81732dd0604 (diff) | |
| download | cpython-4bfecb9298d447d5599ea76f3f68f772c38b8fd0.zip cpython-4bfecb9298d447d5599ea76f3f68f772c38b8fd0.tar.gz cpython-4bfecb9298d447d5599ea76f3f68f772c38b8fd0.tar.bz2 | |
[3.6] bpo-35011: Restore use of pyexpatns.h in libexpat (GH-9939) (GH-9941)
Restores the use of pyexpatns.h to isolate our embedded copy of the expat C
library so that its symbols do not conflict at link or dynamic loading time
with an embedding application or other extension modules with their own
version of libexpat.
https://github.com/python/cpython/commit/5dc3f23b5fb0b510926012cb3732dae63cddea60GH-diff-3afaf7274c90ce1b7405f75ad825f545 inadvertently removed it when upgrading expat.
(cherry picked from commit 9d4712bc8f26bf1d7e626b53ab092fe030bcd68d)
Co-authored-by: Gregory P. Smith <greg@krypto.org>
https://bugs.python.org/issue35011
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/expat/expat_external.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h index 629483a..2d96b4f 100644 --- a/Modules/expat/expat_external.h +++ b/Modules/expat/expat_external.h @@ -35,6 +35,10 @@ /* External API definitions */ +/* Namespace external symbols to allow multiple libexpat version to + co-exist. */ +#include "pyexpatns.h" + #if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__) # define XML_USE_MSC_EXTENSIONS 1 #endif |