summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2017-03-09 10:51:44 +0200
committerGitHub <noreply@github.com>2017-03-09 10:51:44 +0200
commit9cef253ae3251b22d2fbb475fcb7a28805b78c86 (patch)
treeda9686ed6af2623fda53d9a2b1eefdafc136314f
parent51b646a55a4a1c4d0df764c4404a062fbcc6b356 (diff)
downloadcpython-git-9cef253ae3251b22d2fbb475fcb7a28805b78c86.tar.gz
[3.6] bpo-29768: Fixed compile-time check for expat version. (#576)
(cherry picked from commit 22e707fa04476710ba5cc7e2206e4ac66743931b)
-rw-r--r--Modules/pyexpat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index b3259d57aa..47f70a27f1 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1191,7 +1191,7 @@ newxmlparseobject(const char *encoding, const char *namespace_separator, PyObjec
Py_DECREF(self);
return NULL;
}
-#if ((XML_MAJOR_VERSION >= 2) && (XML_MINOR_VERSION >= 1)) || defined(XML_HAS_SET_HASH_SALT)
+#if XML_COMBINED_VERSION >= 20100 || defined(XML_HAS_SET_HASH_SALT)
/* This feature was added upstream in libexpat 2.1.0. Our expat copy
* has a backport of this feature where we also define XML_HAS_SET_HASH_SALT
* to indicate that we can still use it. */