bpo-29768: Fixed compile-time check for expat version. (#574) (#578)

(cherry picked from commit 22e707fa04)
This commit is contained in:
Serhiy Storchaka 2017-03-09 10:52:19 +02:00 committed by GitHub
parent 0410bee6e6
commit 952b7cb780

View file

@ -1190,7 +1190,7 @@ newxmlparseobject(const char *encoding, const char *namespace_separator, PyObjec
Py_DECREF(self); Py_DECREF(self);
return NULL; 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 /* 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 * has a backport of this feature where we also define XML_HAS_SET_HASH_SALT
* to indicate that we can still use it. */ * to indicate that we can still use it. */