From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 9 Mar 2017 08:52:19 +0000 (+0200)
Subject: bpo-29768: Fixed compile-time check for expat version. (#574) (#578)
X-Git-Tag: v3.5.4rc1~291
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=952b7cb78046f4bc3bf28cb7de84d1c6bcec45d7;p=python

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

(cherry picked from commit 22e707fa04476710ba5cc7e2206e4ac66743931b)
---

diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
index 00c96a16c7..3a6e590ef2 100644
--- a/Modules/pyexpat.c
+++ b/Modules/pyexpat.c
@@ -1190,7 +1190,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. */