From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 4 Feb 2014 15:10:55 +0000 (-0500)
Subject: restore namespacing of pyexpat symbols (closes #19186)
X-Git-Tag: v3.4.0rc1~91^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=091d017ab11b42a542711ede2b171e432a0394b9;p=python

restore namespacing of pyexpat symbols (closes #19186)
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 953ceed575..045be47951 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 2c03284ea2..f337e1c562 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