diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2017-06-14 22:54:36 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 22:54:36 (GMT) |
| commit | 23ec4b57e1359f9c539b8defc317542173ae087e (patch) | |
| tree | 4da31b261e47f72633b4fee215dc804c41541190 /Modules/expat/expat.h | |
| parent | f7e07840d725f2ebb469129cb5e6574ce61725ef (diff) | |
| download | cpython-23ec4b57e1359f9c539b8defc317542173ae087e.zip cpython-23ec4b57e1359f9c539b8defc317542173ae087e.tar.gz cpython-23ec4b57e1359f9c539b8defc317542173ae087e.tar.bz2 | |
bpo-29591: Upgrade Modules/expat to libexpat 2.2 (#2164)
* bpo-29591: Upgrade Modules/expat to libexpat 2.2
* bpo-29591: Restore Python changes on expat
* bpo-29591: Remove expat config of unsupported platforms
Remove the configuration (Modules/expat/*config.h) of unsupported
platforms:
* Amiga
* MacOS Classic on PPC32
* Open Watcom
* bpo-29591: Remove useless XML_HAS_SET_HASH_SALT
The XML_HAS_SET_HASH_SALT define of Modules/expat/expat.h became
useless since our local expat copy was upgrade to expat 2.1 (it's now
expat 2.2.0).
Diffstat (limited to 'Modules/expat/expat.h')
| -rw-r--r-- | Modules/expat/expat.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/Modules/expat/expat.h b/Modules/expat/expat.h index e8eefdd..086e24b 100644 --- a/Modules/expat/expat.h +++ b/Modules/expat/expat.h @@ -342,7 +342,7 @@ XML_SetEntityDeclHandler(XML_Parser parser, XML_EntityDeclHandler handler); /* OBSOLETE -- OBSOLETE -- OBSOLETE - This handler has been superceded by the EntityDeclHandler above. + This handler has been superseded by the EntityDeclHandler above. It is provided here for backward compatibility. This is called for a declaration of an unparsed (NDATA) entity. @@ -915,8 +915,6 @@ XMLPARSEAPI(int) XML_SetHashSalt(XML_Parser parser, unsigned long hash_salt); -#define XML_HAS_SET_HASH_SALT /* Python Only: Defined for pyexpat.c. */ - /* If XML_Parse or XML_ParseBuffer have returned XML_STATUS_ERROR, then XML_GetErrorCode returns information about the error. */ @@ -975,9 +973,12 @@ XML_FreeContentModel(XML_Parser parser, XML_Content *model); /* Exposing the memory handling functions used in Expat */ XMLPARSEAPI(void *) +XML_ATTR_MALLOC +XML_ATTR_ALLOC_SIZE(2) XML_MemMalloc(XML_Parser parser, size_t size); XMLPARSEAPI(void *) +XML_ATTR_ALLOC_SIZE(3) XML_MemRealloc(XML_Parser parser, void *ptr, size_t size); XMLPARSEAPI(void) @@ -1033,14 +1034,12 @@ XMLPARSEAPI(const XML_Feature *) XML_GetFeatureList(void); -/* Expat follows the GNU/Linux convention of odd number minor version for - beta/development releases and even number minor version for stable - releases. Micro is bumped with each release, and set to 0 with each - change to major or minor version. +/* Expat follows the semantic versioning convention. + See http://semver.org. */ #define XML_MAJOR_VERSION 2 -#define XML_MINOR_VERSION 1 -#define XML_MICRO_VERSION 1 +#define XML_MINOR_VERSION 2 +#define XML_MICRO_VERSION 0 #ifdef __cplusplus } |