summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-02-04 15:10:55 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-02-04 15:10:55 (GMT)
commit091d017ab11b42a542711ede2b171e432a0394b9 (patch)
tree32a49dc30de15934b491a31a1edc66f71574675b
parentc5640385800ea75445824d7e8caf8386ded238dc (diff)
downloadcpython-091d017ab11b42a542711ede2b171e432a0394b9.zip
cpython-091d017ab11b42a542711ede2b171e432a0394b9.tar.gz
cpython-091d017ab11b42a542711ede2b171e432a0394b9.tar.bz2
restore namespacing of pyexpat symbols (closes #19186)
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/expat/expat_external.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 953ceed..045be47 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -45,6 +45,8 @@ Core and Builtins
Library
-------
+- Issue #19186: Restore namespacing of expat symbols inside the pyexpat module.
+
- Issue #20426: When passing the re.DEBUG flag, re.compile() displays the
debug output every time it is called, regardless of the compilation cache.
diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h
index 2c03284..f337e1c 100644
--- a/Modules/expat/expat_external.h
+++ b/Modules/expat/expat_external.h
@@ -7,6 +7,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