Skip to content

Commit a92defe

Browse files
author
Git for Windows Build Agent
committed
Update 2 packages
mingw-w64-i686-expat (2.7.1-2 -> 2.7.2-1) mingw-w64-x86_64-expat (2.7.1-2 -> 2.7.2-1) Signed-off-by: Git for Windows Build Agent <[email protected]>
1 parent 755fefc commit a92defe

File tree

49 files changed

+403
-221
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+403
-221
lines changed

mingw32/bin/libexpat-1.dll

2.44 KB
Binary file not shown.

mingw32/bin/xmlwf.exe

-1.41 KB
Binary file not shown.

mingw32/include/expat.h

Lines changed: 37 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,21 @@
4242
*/
4343

4444
#ifndef Expat_INCLUDED
45-
#define Expat_INCLUDED 1
45+
# define Expat_INCLUDED 1
4646

47-
#include <stdlib.h>
48-
#include "expat_external.h"
47+
# include <stdlib.h>
48+
# include "expat_external.h"
4949

50-
#ifdef __cplusplus
50+
# ifdef __cplusplus
5151
extern "C" {
52-
#endif
52+
# endif
5353

5454
struct XML_ParserStruct;
5555
typedef struct XML_ParserStruct *XML_Parser;
5656

5757
typedef unsigned char XML_Bool;
58-
#define XML_TRUE ((XML_Bool)1)
59-
#define XML_FALSE ((XML_Bool)0)
58+
# define XML_TRUE ((XML_Bool)1)
59+
# define XML_FALSE ((XML_Bool)0)
6060

6161
/* The XML_Status enum gives the possible return values for several
6262
API functions. The preprocessor #defines are included so this
@@ -73,11 +73,11 @@ typedef unsigned char XML_Bool;
7373
*/
7474
enum XML_Status {
7575
XML_STATUS_ERROR = 0,
76-
#define XML_STATUS_ERROR XML_STATUS_ERROR
76+
# define XML_STATUS_ERROR XML_STATUS_ERROR
7777
XML_STATUS_OK = 1,
78-
#define XML_STATUS_OK XML_STATUS_OK
78+
# define XML_STATUS_OK XML_STATUS_OK
7979
XML_STATUS_SUSPENDED = 2
80-
#define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED
80+
# define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED
8181
};
8282

8383
enum XML_Error {
@@ -680,7 +680,7 @@ XMLPARSEAPI(void)
680680
XML_SetUserData(XML_Parser parser, void *userData);
681681

682682
/* Returns the last value set by XML_SetUserData or NULL. */
683-
#define XML_GetUserData(parser) (*(void **)(parser))
683+
# define XML_GetUserData(parser) (*(void **)(parser))
684684

685685
/* This is equivalent to supplying an encoding argument to
686686
XML_ParserCreate. On success XML_SetEncoding returns non-zero,
@@ -752,7 +752,7 @@ XML_GetSpecifiedAttributeCount(XML_Parser parser);
752752
XMLPARSEAPI(int)
753753
XML_GetIdAttributeIndex(XML_Parser parser);
754754

755-
#ifdef XML_ATTR_INFO
755+
# ifdef XML_ATTR_INFO
756756
/* Source file byte offsets for the start and end of attribute names and values.
757757
The value indices are exclusive of surrounding quotes; thus in a UTF-8 source
758758
file an attribute value of "blah" will yield:
@@ -773,7 +773,7 @@ typedef struct {
773773
*/
774774
XMLPARSEAPI(const XML_AttrInfo *)
775775
XML_GetAttributeInfo(XML_Parser parser);
776-
#endif
776+
# endif
777777

778778
/* Parses some input. Returns XML_STATUS_ERROR if a fatal error is
779779
detected. The last call to XML_Parse must have isFinal true; len
@@ -970,9 +970,9 @@ XMLPARSEAPI(const char *)
970970
XML_GetInputContext(XML_Parser parser, int *offset, int *size);
971971

972972
/* For backwards compatibility with previous versions. */
973-
#define XML_GetErrorLineNumber XML_GetCurrentLineNumber
974-
#define XML_GetErrorColumnNumber XML_GetCurrentColumnNumber
975-
#define XML_GetErrorByteIndex XML_GetCurrentByteIndex
973+
# define XML_GetErrorLineNumber XML_GetCurrentLineNumber
974+
# define XML_GetErrorColumnNumber XML_GetCurrentColumnNumber
975+
# define XML_GetErrorByteIndex XML_GetCurrentByteIndex
976976

977977
/* Frees the content model passed to the element declaration handler */
978978
XMLPARSEAPI(void)
@@ -1032,7 +1032,10 @@ enum XML_FeatureEnum {
10321032
XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_MAXIMUM_AMPLIFICATION_DEFAULT,
10331033
XML_FEATURE_BILLION_LAUGHS_ATTACK_PROTECTION_ACTIVATION_THRESHOLD_DEFAULT,
10341034
/* Added in Expat 2.6.0. */
1035-
XML_FEATURE_GE
1035+
XML_FEATURE_GE,
1036+
/* Added in Expat 2.7.2. */
1037+
XML_FEATURE_ALLOC_TRACKER_MAXIMUM_AMPLIFICATION_DEFAULT,
1038+
XML_FEATURE_ALLOC_TRACKER_ACTIVATION_THRESHOLD_DEFAULT,
10361039
/* Additional features must be added to the end of this enum. */
10371040
};
10381041

@@ -1045,7 +1048,7 @@ typedef struct {
10451048
XMLPARSEAPI(const XML_Feature *)
10461049
XML_GetFeatureList(void);
10471050

1048-
#if defined(XML_DTD) || (defined(XML_GE) && XML_GE == 1)
1051+
# if defined(XML_DTD) || (defined(XML_GE) && XML_GE == 1)
10491052
/* Added in Expat 2.4.0 for XML_DTD defined and
10501053
* added in Expat 2.6.0 for XML_GE == 1. */
10511054
XMLPARSEAPI(XML_Bool)
@@ -1057,7 +1060,17 @@ XML_SetBillionLaughsAttackProtectionMaximumAmplification(
10571060
XMLPARSEAPI(XML_Bool)
10581061
XML_SetBillionLaughsAttackProtectionActivationThreshold(
10591062
XML_Parser parser, unsigned long long activationThresholdBytes);
1060-
#endif
1063+
1064+
/* Added in Expat 2.7.2. */
1065+
XMLPARSEAPI(XML_Bool)
1066+
XML_SetAllocTrackerMaximumAmplification(XML_Parser parser,
1067+
float maximumAmplificationFactor);
1068+
1069+
/* Added in Expat 2.7.2. */
1070+
XMLPARSEAPI(XML_Bool)
1071+
XML_SetAllocTrackerActivationThreshold(
1072+
XML_Parser parser, unsigned long long activationThresholdBytes);
1073+
# endif
10611074

10621075
/* Added in Expat 2.6.0. */
10631076
XMLPARSEAPI(XML_Bool)
@@ -1066,12 +1079,12 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled);
10661079
/* Expat follows the semantic versioning convention.
10671080
See https://semver.org
10681081
*/
1069-
#define XML_MAJOR_VERSION 2
1070-
#define XML_MINOR_VERSION 7
1071-
#define XML_MICRO_VERSION 1
1082+
# define XML_MAJOR_VERSION 2
1083+
# define XML_MINOR_VERSION 7
1084+
# define XML_MICRO_VERSION 2
10721085

1073-
#ifdef __cplusplus
1086+
# ifdef __cplusplus
10741087
}
1075-
#endif
1088+
# endif
10761089

10771090
#endif /* not Expat_INCLUDED */

mingw32/include/expat_config.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/* Define to 1 if you have the <fcntl.h> header file. */
2626
#define HAVE_FCNTL_H 1
2727

28-
/* Define to 1 if you have the `getpagesize' function. */
28+
/* Define to 1 if you have the 'getpagesize' function. */
2929
#define HAVE_GETPAGESIZE 1
3030

3131
/* Define to 1 if you have the `getrandom' function. */
@@ -34,10 +34,10 @@
3434
/* Define to 1 if you have the <inttypes.h> header file. */
3535
#define HAVE_INTTYPES_H 1
3636

37-
/* Define to 1 if you have the `bsd' library (-lbsd). */
37+
/* Define to 1 if you have the 'bsd' library (-lbsd). */
3838
/* #undef HAVE_LIBBSD */
3939

40-
/* Define to 1 if you have a working `mmap' system call. */
40+
/* Define to 1 if you have a working 'mmap' system call. */
4141
/* #undef HAVE_MMAP */
4242

4343
/* Define to 1 if you have the <stdint.h> header file. */
@@ -83,7 +83,7 @@
8383
#define PACKAGE_NAME "expat"
8484

8585
/* Define to the full name and version of this package. */
86-
#define PACKAGE_STRING "expat 2.7.1"
86+
#define PACKAGE_STRING "expat 2.7.2"
8787

8888
/* Define to the one symbol short name of this package. */
8989
#define PACKAGE_TARNAME "expat"
@@ -92,15 +92,15 @@
9292
#define PACKAGE_URL ""
9393

9494
/* Define to the version of this package. */
95-
#define PACKAGE_VERSION "2.7.1"
95+
#define PACKAGE_VERSION "2.7.2"
9696

97-
/* Define to 1 if all of the C90 standard headers exist (not just the ones
97+
/* Define to 1 if all of the C89 standard headers exist (not just the ones
9898
required in a freestanding environment). This macro is provided for
9999
backward compatibility; new code need not use it. */
100100
#define STDC_HEADERS 1
101101

102102
/* Version number of package */
103-
#define VERSION "2.7.1"
103+
#define VERSION "2.7.2"
104104

105105
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
106106
significant byte first (like Motorola and SPARC, unlike Intel). */
@@ -134,10 +134,10 @@
134134
/* Define to make XML Namespaces functionality available. */
135135
#define XML_NS 1
136136

137-
/* Define to empty if `const' does not conform to ANSI C. */
137+
/* Define to empty if 'const' does not conform to ANSI C. */
138138
/* #undef const */
139139

140-
/* Define to `long int' if <sys/types.h> does not define. */
140+
/* Define to 'long int' if <sys/types.h> does not define. */
141141
/* #undef off_t */
142142

143143
#endif // ndef EXPAT_CONFIG_H

mingw32/include/expat_external.h

Lines changed: 62 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
*/
3939

4040
#ifndef Expat_External_INCLUDED
41-
#define Expat_External_INCLUDED 1
41+
# define Expat_External_INCLUDED 1
4242

4343
/* External API definitions */
4444

@@ -64,12 +64,12 @@
6464
compiled with the cdecl calling convention as the default since
6565
system headers may assume the cdecl convention.
6666
*/
67-
#ifndef XMLCALL
68-
# if defined(_MSC_VER)
69-
# define XMLCALL __cdecl
70-
# elif defined(__GNUC__) && defined(__i386) && ! defined(__INTEL_COMPILER)
71-
# define XMLCALL __attribute__((cdecl))
72-
# else
67+
# ifndef XMLCALL
68+
# if defined(_MSC_VER)
69+
# define XMLCALL __cdecl
70+
# elif defined(__GNUC__) && defined(__i386) && ! defined(__INTEL_COMPILER)
71+
# define XMLCALL __attribute__((cdecl))
72+
# else
7373
/* For any platform which uses this definition and supports more than
7474
one calling convention, we need to extend this definition to
7575
declare the convention used on that platform, if it's possible to
@@ -80,86 +80,87 @@
8080
pre-processor and how to specify the same calling convention as the
8181
platform's malloc() implementation.
8282
*/
83-
# define XMLCALL
84-
# endif
85-
#endif /* not defined XMLCALL */
83+
# define XMLCALL
84+
# endif
85+
# endif /* not defined XMLCALL */
8686

87-
#if ! defined(XML_STATIC) && ! defined(XMLIMPORT)
88-
# ifndef XML_BUILDING_EXPAT
87+
# if ! defined(XML_STATIC) && ! defined(XMLIMPORT)
88+
# ifndef XML_BUILDING_EXPAT
8989
/* using Expat from an application */
9090

91-
# if defined(_MSC_EXTENSIONS) && ! defined(__BEOS__) && ! defined(__CYGWIN__)
92-
# define XMLIMPORT __declspec(dllimport)
91+
# if defined(_MSC_EXTENSIONS) && ! defined(__BEOS__) \
92+
&& ! defined(__CYGWIN__)
93+
# define XMLIMPORT __declspec(dllimport)
94+
# endif
95+
9396
# endif
97+
# endif /* not defined XML_STATIC */
9498

99+
# ifndef XML_ENABLE_VISIBILITY
100+
# define XML_ENABLE_VISIBILITY 0
95101
# endif
96-
#endif /* not defined XML_STATIC */
97-
98-
#ifndef XML_ENABLE_VISIBILITY
99-
# define XML_ENABLE_VISIBILITY 0
100-
#endif
101102

102-
#if ! defined(XMLIMPORT) && XML_ENABLE_VISIBILITY
103-
# define XMLIMPORT __attribute__((visibility("default")))
104-
#endif
103+
# if ! defined(XMLIMPORT) && XML_ENABLE_VISIBILITY
104+
# define XMLIMPORT __attribute__((visibility("default")))
105+
# endif
105106

106107
/* If we didn't define it above, define it away: */
107-
#ifndef XMLIMPORT
108-
# define XMLIMPORT
109-
#endif
110-
111-
#if defined(__GNUC__) \
112-
&& (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
113-
# define XML_ATTR_MALLOC __attribute__((__malloc__))
114-
#else
115-
# define XML_ATTR_MALLOC
116-
#endif
117-
118-
#if defined(__GNUC__) \
119-
&& ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
120-
# define XML_ATTR_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
121-
#else
122-
# define XML_ATTR_ALLOC_SIZE(x)
123-
#endif
124-
125-
#define XMLPARSEAPI(type) XMLIMPORT type XMLCALL
126-
127-
#ifdef __cplusplus
128-
extern "C" {
129-
#endif
108+
# ifndef XMLIMPORT
109+
# define XMLIMPORT
110+
# endif
111+
112+
# if defined(__GNUC__) \
113+
&& (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
114+
# define XML_ATTR_MALLOC __attribute__((__malloc__))
115+
# else
116+
# define XML_ATTR_MALLOC
117+
# endif
130118

131-
#ifdef XML_UNICODE_WCHAR_T
132-
# ifndef XML_UNICODE
133-
# define XML_UNICODE
119+
# if defined(__GNUC__) \
120+
&& ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
121+
# define XML_ATTR_ALLOC_SIZE(x) __attribute__((__alloc_size__(x)))
122+
# else
123+
# define XML_ATTR_ALLOC_SIZE(x)
134124
# endif
135-
# if defined(__SIZEOF_WCHAR_T__) && (__SIZEOF_WCHAR_T__ != 2)
136-
# error "sizeof(wchar_t) != 2; Need -fshort-wchar for both Expat and libc"
125+
126+
# define XMLPARSEAPI(type) XMLIMPORT type XMLCALL
127+
128+
# ifdef __cplusplus
129+
extern "C" {
137130
# endif
138-
#endif
139131

140-
#ifdef XML_UNICODE /* Information is UTF-16 encoded. */
141132
# ifdef XML_UNICODE_WCHAR_T
133+
# ifndef XML_UNICODE
134+
# define XML_UNICODE
135+
# endif
136+
# if defined(__SIZEOF_WCHAR_T__) && (__SIZEOF_WCHAR_T__ != 2)
137+
# error "sizeof(wchar_t) != 2; Need -fshort-wchar for both Expat and libc"
138+
# endif
139+
# endif
140+
141+
# ifdef XML_UNICODE /* Information is UTF-16 encoded. */
142+
# ifdef XML_UNICODE_WCHAR_T
142143
typedef wchar_t XML_Char;
143144
typedef wchar_t XML_LChar;
144-
# else
145+
# else
145146
typedef unsigned short XML_Char;
146147
typedef char XML_LChar;
147-
# endif /* XML_UNICODE_WCHAR_T */
148-
#else /* Information is UTF-8 encoded. */
148+
# endif /* XML_UNICODE_WCHAR_T */
149+
# else /* Information is UTF-8 encoded. */
149150
typedef char XML_Char;
150151
typedef char XML_LChar;
151-
#endif /* XML_UNICODE */
152+
# endif /* XML_UNICODE */
152153

153-
#ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */
154+
# ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */
154155
typedef long long XML_Index;
155156
typedef unsigned long long XML_Size;
156-
#else
157+
# else
157158
typedef long XML_Index;
158159
typedef unsigned long XML_Size;
159-
#endif /* XML_LARGE_SIZE */
160+
# endif /* XML_LARGE_SIZE */
160161

161-
#ifdef __cplusplus
162+
# ifdef __cplusplus
162163
}
163-
#endif
164+
# endif
164165

165166
#endif /* not Expat_External_INCLUDED */

mingw32/lib/cmake/expat-2.7.1/expat-config-version.cmake renamed to mingw32/lib/cmake/expat-2.7.2/expat-config-version.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
# The variable CVF_VERSION must be set before calling configure_file().
1010

1111

12-
set(PACKAGE_VERSION "2.7.1")
12+
set(PACKAGE_VERSION "2.7.2")
1313

1414
if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
1515
set(PACKAGE_VERSION_COMPATIBLE FALSE)
1616
else()
1717

18-
if("2.7.1" MATCHES "^([0-9]+)\\.")
18+
if("2.7.2" MATCHES "^([0-9]+)\\.")
1919
set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
2020
if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
2121
string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
2222
endif()
2323
else()
24-
set(CVF_VERSION_MAJOR "2.7.1")
24+
set(CVF_VERSION_MAJOR "2.7.2")
2525
endif()
2626

2727
if(PACKAGE_FIND_VERSION_RANGE)
File renamed without changes.
File renamed without changes.

mingw32/lib/libexpat.a

10.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)