restore namespacing of pyexpat symbols (closes #19186)

2014-02-04 10:10:55 -05:00 · 2014-02-04 10:10:55 -05:00 · 091d017ab1
parent c564038580
commit 091d017ab1
2 changed files with 6 additions and 0 deletions
--- 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.

--- 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