restore namespacing of pyexpat symbols (closes #19186)

diff --git a/Misc/NEWS b/Misc/NEWS
index 953ceed575a04285993963d6c78f5210cf1bfb5d..045be47951c6d3fe539f1c00e469f2f27ef371ca 100644 (file)
--- 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 2c03284ea265bc62bbae15e29e48f7b0df4cef0d..f337e1c5622a952b513a53028a2fb9fa0f6998c7 100644 (file)
--- 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