summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-02-04 15:12:18 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-02-04 15:12:18 (GMT)
commite9e89076474f50a120ddbc554b8e517420e47e33 (patch)
treebd6841333526cfcf82c5aa219d9e7f519802f46e /Modules
parent6edd82a1d25bb941ebb5f5e98690ddc2ddbbd79e (diff)
parent091d017ab11b42a542711ede2b171e432a0394b9 (diff)
downloadcpython-e9e89076474f50a120ddbc554b8e517420e47e33.zip
cpython-e9e89076474f50a120ddbc554b8e517420e47e33.tar.gz
cpython-e9e89076474f50a120ddbc554b8e517420e47e33.tar.bz2
merge 3.3 (#19186)
Diffstat (limited to 'Modules')
-rw-r--r--Modules/expat/expat_external.h4
1 files changed, 4 insertions, 0 deletions
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