[Python-checkins] Put pyexpatns.h include back. bpo-37437 (GH-14542)

Benjamin Peterson webhook-mailer at python.org
Tue Jul 2 01:48:20 EDT 2019


https://github.com/python/cpython/commit/29d6905826d4417426e70f6209ca5e0db7921685
commit: 29d6905826d4417426e70f6209ca5e0db7921685
branch: 3.6
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: Benjamin Peterson <benjamin at python.org>
date: 2019-07-01T22:48:16-07:00
summary:

Put pyexpatns.h include back. bpo-37437 (GH-14542)

(cherry picked from commit 2cd07920bb7d2d319999394092190f37935dc421)

Co-authored-by: Benjamin Peterson <benjamin at python.org>

files:
M Modules/expat/expat_external.h

diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h
index 875225d77e50..fc63c2228d3e 100644
--- a/Modules/expat/expat_external.h
+++ b/Modules/expat/expat_external.h
@@ -81,6 +81,10 @@
 # endif
 #endif  /* not defined XMLCALL */
 
+/* Namespace external symbols to allow multiple libexpat version to
+   co-exist. */
+#include "pyexpatns.h"
+
 
 #if !defined(XML_STATIC) && !defined(XMLIMPORT)
 # ifndef XML_BUILDING_EXPAT



More information about the Python-checkins mailing list