| Index: third_party/expat/files/lib/expat.h
|
| diff --git a/third_party/expat/files/lib/expat.h b/third_party/expat/files/lib/expat.h
|
| index 9a21680be468cad28a05d2daec71102333024efa..086e24b39c51ae6df87e0485162dafced00c136b 100644
|
| --- a/third_party/expat/files/lib/expat.h
|
| +++ b/third_party/expat/files/lib/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.
|
| @@ -973,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)
|
| @@ -1031,13 +1034,11 @@ 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_MINOR_VERSION 2
|
| #define XML_MICRO_VERSION 0
|
|
|
| #ifdef __cplusplus
|
|
|