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

serhiy-storchaka · web-flow · commit 9cef253ae325 · 2017-03-09T10:51:44.000+02:00
(cherry picked from commit 22e707f)
diff --git 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. */

Original file line number	Diff line number	Diff line change
`@@ -1191,7 +1191,7 @@ newxmlparseobject(const char encoding, const char namespace_separator, PyObjec`
`1191`	`1191`	`Py_DECREF(self);`
`1192`	`1192`	`return NULL;`
`1193`	`1193`	`}`
`1194`		`-#if ((XML_MAJOR_VERSION >= 2) && (XML_MINOR_VERSION >= 1)) \|\| defined(XML_HAS_SET_HASH_SALT)`
	`1194`	`+#if XML_COMBINED_VERSION >= 20100 \|\| defined(XML_HAS_SET_HASH_SALT)`
`1195`	`1195`	`/* This feature was added upstream in libexpat 2.1.0. Our expat copy`
`1196`	`1196`	`* has a backport of this feature where we also define XML_HAS_SET_HASH_SALT`
`1197`	`1197`	`* to indicate that we can still use it. */`