summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2017-03-09 07:47:52 (GMT)
committerGitHub <noreply@github.com>2017-03-09 07:47:52 (GMT)
commit22e707fa04476710ba5cc7e2206e4ac66743931b (patch)
treed2aaddd5550d6946b884cd12959cbb4a662113b7
parent390a0969c1206a37c86961ebf7ef3050681ed8dd (diff)
downloadcpython-22e707fa04476710ba5cc7e2206e4ac66743931b.zip
cpython-22e707fa04476710ba5cc7e2206e4ac66743931b.tar.gz
cpython-22e707fa04476710ba5cc7e2206e4ac66743931b.tar.bz2
bpo-29768: Fixed compile-time check for expat version. (#574)
-rw-r--r--Modules/pyexpat.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index e0c9be7..653295b 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1188,7 +1188,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. */