Skip to content

Commit 009b4d3

Browse files
committed
Upgrade libexpat to 2.7.0
1 parent e4c989f commit 009b4d3

File tree

3 files changed

+463
-167
lines changed

3 files changed

+463
-167
lines changed

src/simgear/xml/expat.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Copyright (c) 2000-2005 Fred L. Drake, Jr. <fdrake@users.sourceforge.net>
1212
Copyright (c) 2001-2002 Greg Stein <gstein@users.sourceforge.net>
1313
Copyright (c) 2002-2016 Karl Waclawek <karl@waclawek.net>
14-
Copyright (c) 2016-2024 Sebastian Pipping <sebastian@pipping.org>
14+
Copyright (c) 2016-2025 Sebastian Pipping <sebastian@pipping.org>
1515
Copyright (c) 2016 Cristian Rodríguez <crrodriguez@opensuse.org>
1616
Copyright (c) 2016 Thomas Beutlich <tc@tbeu.de>
1717
Copyright (c) 2017 Rhodri James <rhodri@wildebeest.org.uk>
@@ -130,7 +130,9 @@ enum XML_Error {
130130
/* Added in 2.3.0. */
131131
XML_ERROR_NO_BUFFER,
132132
/* Added in 2.4.0. */
133-
XML_ERROR_AMPLIFICATION_LIMIT_BREACH
133+
XML_ERROR_AMPLIFICATION_LIMIT_BREACH,
134+
/* Added in 2.6.4. */
135+
XML_ERROR_NOT_STARTED,
134136
};
135137

136138
enum XML_Content_Type {
@@ -1065,8 +1067,8 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
10651067
See https://semver.org
10661068
*/
10671069
#define XML_MAJOR_VERSION 2
1068-
#define XML_MINOR_VERSION 6
1069-
#define XML_MICRO_VERSION 2
1070+
#define XML_MINOR_VERSION 7
1071+
#define XML_MICRO_VERSION 0
10701072

10711073
#ifdef __cplusplus
10721074
}

src/simgear/xml/siphash.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,7 @@
126126
| ((uint64_t)((p)[4]) << 32) | ((uint64_t)((p)[5]) << 40) \
127127
| ((uint64_t)((p)[6]) << 48) | ((uint64_t)((p)[7]) << 56))
128128

129-
#define SIPHASH_INITIALIZER \
130-
{ 0, 0, 0, 0, {0}, 0, 0 }
129+
#define SIPHASH_INITIALIZER {0, 0, 0, 0, {0}, 0, 0}
131130

132131
struct siphash {
133132
uint64_t v0, v1, v2, v3;

0 commit comments

Comments
 (0)