traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

(cherry picked from commit 22e707fa04)
This commit is contained in:
Serhiy Storchaka 2017-03-09 10:52:50 +02:00 committed by GitHub
parent de1c7d5252
commit 0c2ed76fda
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/pyexpat.c
View File

@ -1319,7 +1319,7 @@ newxmlparseobject(char *encoding, char *namespace_separator, PyObject *intern)
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. */