forked from JSBSim-Team/jsbsim
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade libexpat to 2.6.2 (JSBSim-Team#1080)
- Loading branch information
Showing
17 changed files
with
502 additions
and
592 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,11 +11,14 @@ | |
| Copyright (c) 2000-2005 Fred L. Drake, Jr. <[email protected]> | ||
| Copyright (c) 2001-2002 Greg Stein <[email protected]> | ||
| Copyright (c) 2002-2016 Karl Waclawek <[email protected]> | ||
| Copyright (c) 2016-2022 Sebastian Pipping <[email protected]> | ||
| Copyright (c) 2016-2024 Sebastian Pipping <[email protected]> | ||
| Copyright (c) 2016 Cristian Rodríguez <[email protected]> | ||
| Copyright (c) 2016 Thomas Beutlich <[email protected]> | ||
| Copyright (c) 2017 Rhodri James <[email protected]> | ||
| Copyright (c) 2022 Thijs Schreijer <[email protected]> | ||
| Copyright (c) 2023 Hanno Böck <[email protected]> | ||
| Copyright (c) 2023 Sony Corporation / Snild Dolkow <[email protected]> | ||
| Copyright (c) 2024 Taichi Haradaguchi <[email protected]> | ||
| Licensed under the MIT license: | ||
| Permission is hereby granted, free of charge, to any person obtaining | ||
|
|
@@ -269,7 +272,7 @@ XML_ParserCreate_MM(const XML_Char *encoding, | |
| const XML_Memory_Handling_Suite *memsuite, | ||
| const XML_Char *namespaceSeparator); | ||
|
|
||
| /* Prepare a parser object to be re-used. This is particularly | ||
| /* Prepare a parser object to be reused. This is particularly | ||
| valuable when memory allocation overhead is disproportionately high, | ||
| such as when a large number of small documnents need to be parsed. | ||
| All handlers are cleared from the parser, except for the | ||
|
|
@@ -951,7 +954,7 @@ XMLPARSEAPI(XML_Index) XML_GetCurrentByteIndex(XML_Parser parser); | |
| XMLPARSEAPI(int) | ||
| XML_GetCurrentByteCount(XML_Parser parser); | ||
|
|
||
| /* If XML_CONTEXT_BYTES is defined, returns the input buffer, sets | ||
| /* If XML_CONTEXT_BYTES is >=1, returns the input buffer, sets | ||
| the integer pointed to by offset to the offset within this buffer | ||
| of the current parse position, and sets the integer pointed to by size | ||
| to the size of this buffer (the number of input bytes). Otherwise | ||
|
|
@@ -1025,7 +1028,9 @@ enum XML_FeatureEnum { | |
| XML_FEATURE_ATTR_INFO, | ||
| /* Added in Expat 2.4.0. */ | ||
| XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT, | ||
| XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT | ||
| XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT, | ||
| /* Added in Expat 2.6.0. */ | ||
| XML_FEATURE_GE | ||
| /* Additional features must be added to the end of this enum. */ | ||
| }; | ||
|
|
||
|
|
@@ -1038,24 +1043,30 @@ typedef struct { | |
| XMLPARSEAPI(const XML_Feature *) | ||
| XML_GetFeatureList(void); | ||
|
|
||
| #ifdef XML_DTD | ||
| /* Added in Expat 2.4.0. */ | ||
| #if defined(XML_DTD) || (defined(XML_GE) && XML_GE == 1) | ||
| /* Added in Expat 2.4.0 for XML_DTD defined and | ||
| * added in Expat 2.6.0 for XML_GE == 1. */ | ||
| XMLPARSEAPI(XML_Bool) | ||
| XML_SetBillionLaughsAttackProtectionMaximumAmplification( | ||
| XML_Parser parser, float maximumAmplificationFactor); | ||
|
|
||
| /* Added in Expat 2.4.0. */ | ||
| /* Added in Expat 2.4.0 for XML_DTD defined and | ||
| * added in Expat 2.6.0 for XML_GE == 1. */ | ||
| XMLPARSEAPI(XML_Bool) | ||
| XML_SetBillionLaughsAttackProtectionActivationThreshold( | ||
| XML_Parser parser, unsigned long long activationThresholdBytes); | ||
| #endif | ||
|
|
||
| /* Added in Expat 2.6.0. */ | ||
| XMLPARSEAPI(XML_Bool) | ||
| XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled); | ||
|
|
||
| /* Expat follows the semantic versioning convention. | ||
| See http://semver.org. | ||
| See https://semver.org | ||
| */ | ||
| #define XML_MAJOR_VERSION 2 | ||
| #define XML_MINOR_VERSION 4 | ||
| #define XML_MICRO_VERSION 8 | ||
| #define XML_MINOR_VERSION 6 | ||
| #define XML_MICRO_VERSION 2 | ||
|
|
||
| #ifdef __cplusplus | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,9 +28,11 @@ | |
| Copyright (c) 2002-2003 Fred L. Drake, Jr. <[email protected]> | ||
| Copyright (c) 2002-2006 Karl Waclawek <[email protected]> | ||
| Copyright (c) 2003 Greg Stein <[email protected]> | ||
| Copyright (c) 2016-2021 Sebastian Pipping <[email protected]> | ||
| Copyright (c) 2016-2024 Sebastian Pipping <[email protected]> | ||
| Copyright (c) 2018 Yury Gribov <[email protected]> | ||
| Copyright (c) 2019 David Loffredo <[email protected]> | ||
| Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow <[email protected]> | ||
| Copyright (c) 2024 Taichi Haradaguchi <[email protected]> | ||
| Licensed under the MIT license: | ||
| Permission is hereby granted, free of charge, to any person obtaining | ||
|
|
@@ -107,7 +109,9 @@ | |
|
|
||
| #include <limits.h> // ULONG_MAX | ||
|
|
||
| #if defined(_WIN32) && ! defined(__USE_MINGW_ANSI_STDIO) | ||
| #if defined(_WIN32) \ | ||
| && (! defined(__USE_MINGW_ANSI_STDIO) \ | ||
| || (1 - __USE_MINGW_ANSI_STDIO - 1 == 0)) | ||
| # define EXPAT_FMT_ULL(midpart) "%" midpart "I64u" | ||
| # if defined(_WIN64) // Note: modifiers "td" and "zu" do not work for MinGW | ||
| # define EXPAT_FMT_PTRDIFF_T(midpart) "%" midpart "I64d" | ||
|
|
@@ -152,12 +156,21 @@ extern "C" { | |
| void _INTERNAL_trim_to_complete_utf8_characters(const char *from, | ||
| const char **fromLimRef); | ||
|
|
||
| #if defined(XML_DTD) | ||
| #if defined(XML_GE) && XML_GE == 1 | ||
| unsigned long long testingAccountingGetCountBytesDirect(XML_Parser parser); | ||
| unsigned long long testingAccountingGetCountBytesIndirect(XML_Parser parser); | ||
| const char *unsignedCharToPrintable(unsigned char c); | ||
| #endif | ||
|
|
||
| extern | ||
| #if ! defined(XML_TESTING) | ||
| const | ||
| #endif | ||
| XML_Bool g_reparseDeferralEnabledDefault; // written ONLY in runtests.c | ||
| #if defined(XML_TESTING) | ||
| extern unsigned int g_bytesScanned; // used for testing only | ||
| #endif | ||
|
|
||
| #ifdef __cplusplus | ||
| } | ||
| #endif | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,8 @@ | |
| Copyright (c) 2000 Clark Cooper <[email protected]> | ||
| Copyright (c) 2002 Greg Stein <[email protected]> | ||
| Copyright (c) 2005 Karl Waclawek <[email protected]> | ||
| Copyright (c) 2017-2021 Sebastian Pipping <[email protected]> | ||
| Copyright (c) 2017-2023 Sebastian Pipping <[email protected]> | ||
| Copyright (c) 2023 Orgad Shaneh <[email protected]> | ||
| Licensed under the MIT license: | ||
| Permission is hereby granted, free of charge, to any person obtaining | ||
|
|
@@ -35,7 +36,9 @@ | |
| #ifndef WINCONFIG_H | ||
| #define WINCONFIG_H | ||
|
|
||
| #define WIN32_LEAN_AND_MEAN | ||
| #ifndef WIN32_LEAN_AND_MEAN | ||
| # define WIN32_LEAN_AND_MEAN | ||
| #endif | ||
| #include <windows.h> | ||
| #undef WIN32_LEAN_AND_MEAN | ||
|
|
||
|
|
||
Oops, something went wrong.