[2.7] bpo-29768: Fixed compile-time check for expat version. (#577)

serhiy-storchaka · web-flow · commit 0c2ed76fda39 · 2017-03-09T10:52:50.000+02:00
(cherry picked from commit 22e707f)
diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
@@ -1319,7 +1319,7 @@ newxmlparseobject(char *encoding, char *namespace_separator, PyObject *intern)
         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. */

Original file line number	Diff line number	Diff line change
`@@ -1319,7 +1319,7 @@ newxmlparseobject(char encoding, char namespace_separator, PyObject *intern)`
`1319`	`1319`	`return NULL;`
`1320`	`1320`	`}`
`1321`	`1321`
`1322`		`-#if ((XML_MAJOR_VERSION >= 2) && (XML_MINOR_VERSION >= 1)) \|\| defined(XML_HAS_SET_HASH_SALT)`
	`1322`	`+#if XML_COMBINED_VERSION >= 20100 \|\| defined(XML_HAS_SET_HASH_SALT)`
`1323`	`1323`	`/* This feature was added upstream in libexpat 2.1.0. Our expat copy`
`1324`	`1324`	`* has a backport of this feature where we also define XML_HAS_SET_HASH_SALT`
`1325`	`1325`	`* to indicate that we can still use it. */`