From 52974c7b281dc660c4b8f1e1a12701d25edddb4c Mon Sep 17 00:00:00 2001 From: Stefano Bonicatti Date: Wed, 20 Dec 2023 14:19:51 +0100 Subject: [PATCH] cve: Update libxml2 to v2.13.2 (#8223) Also resolves CVE-2023-45322. --- libraries/cmake/source/libxml2/README.md | 12 +- .../libxml2/config/linux/aarch64/config.h | 45 +- .../libxml2/config/linux/x86_64/config.h | 45 +- .../libxml2/config/macos/aarch64/config.h | 45 +- .../libxml2/config/macos/x86_64/config.h | 45 +- .../version/linux/aarch64/libxml/xmlversion.h | 71 +- .../version/linux/x86_64/libxml/xmlversion.h | 71 +- .../version/macos/aarch64/libxml/xmlversion.h | 71 +- .../version/macos/x86_64/libxml/xmlversion.h | 71 +- .../windows/aarch64/libxml/xmlversion.h | 1035 ++++++++--------- .../windows/x86_64/libxml/xmlversion.h | 56 +- libraries/cmake/source/libxml2/src | 2 +- libraries/third_party_libraries_manifest.json | 4 +- 13 files changed, 689 insertions(+), 884 deletions(-) diff --git a/libraries/cmake/source/libxml2/README.md b/libraries/cmake/source/libxml2/README.md index 400416949df..728b2a1642e 100644 --- a/libraries/cmake/source/libxml2/README.md +++ b/libraries/cmake/source/libxml2/README.md @@ -44,12 +44,14 @@ cmake \ -DLIBXML2_WITH_TESTS=OFF \ -DLIBXML2_WITH_THREADS=ON \ -DLIBXML2_WITH_THREAD_ALLOC=OFF \ + -DLIBXML2_WITH_TLS=OFF \ -DLIBXML2_WITH_TREE=ON \ -DLIBXML2_WITH_VALID=OFF \ -DLIBXML2_WITH_WRITER=ON \ -DLIBXML2_WITH_XINCLUDE=OFF \ -DLIBXML2_WITH_XPATH=ON \ -DLIBXML2_WITH_XPTR=ON \ + -DLIBXML2_WITH_XPTR_LOCS=OFF \ -DLIBXML2_WITH_ZLIB=ON \ -DHAVE_VA_COPY:BOOL=ON ``` @@ -72,14 +74,14 @@ Make sure you are working in a clean source folder: git reset --hard ; git clean -ffdx ``` -When building for macOS ARM, also pass the following parameter: `-DCMAKE_OSX_ARCHITECTURES=arm64` and change `-DCMAKE_OSX_DEPLOYMENT_TARGET` to `10.15`. +When building for macOS ARM, also pass the following parameter: `-DCMAKE_OSX_ARCHITECTURES=arm64`, or use `-DCMAKE_OSX_ARCHITECTURES=x86_64` for x86_64. ```bash cmake \ -S . \ -B build \ - -DCMAKE_OSX_SYSROOT=/Applications/Xcode_13.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk \ - -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 \ + -DCMAKE_OSX_SYSROOT=/Applications/Xcode_15.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk \ + -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \ -DBUILD_SHARED_LIBS=OFF \ -DLIBXML2_WITH_C14N=ON \ -DLIBXML2_WITH_CATALOG=OFF \ @@ -107,12 +109,14 @@ cmake \ -DLIBXML2_WITH_TESTS=OFF \ -DLIBXML2_WITH_THREADS=ON \ -DLIBXML2_WITH_THREAD_ALLOC=OFF \ + -DLIBXML2_WITH_TLS=OFF \ -DLIBXML2_WITH_TREE=ON \ -DLIBXML2_WITH_VALID=OFF \ -DLIBXML2_WITH_WRITER=ON \ -DLIBXML2_WITH_XINCLUDE=OFF \ -DLIBXML2_WITH_XPATH=ON \ -DLIBXML2_WITH_XPTR=ON \ + -DLIBXML2_WITH_XPTR_LOCS=OFF \ -DLIBXML2_WITH_ZLIB=ON ``` @@ -171,12 +175,14 @@ cmake ^ -DLIBXML2_WITH_TESTS=OFF ^ -DLIBXML2_WITH_THREADS=ON ^ -DLIBXML2_WITH_THREAD_ALLOC=OFF ^ + -DLIBXML2_WITH_TLS=OFF ^ -DLIBXML2_WITH_TREE=ON ^ -DLIBXML2_WITH_VALID=OFF ^ -DLIBXML2_WITH_WRITER=ON ^ -DLIBXML2_WITH_XINCLUDE=OFF ^ -DLIBXML2_WITH_XPATH=ON ^ -DLIBXML2_WITH_XPTR=ON ^ + -DLIBXML2_WITH_XPTR_LOCS=OFF ^ -DLIBXML2_WITH_ZLIB=ON ^ ``` diff --git a/libraries/cmake/source/libxml2/config/linux/aarch64/config.h b/libraries/cmake/source/libxml2/config/linux/aarch64/config.h index bccac9eb459..dadc8707014 100644 --- a/libraries/cmake/source/libxml2/config/linux/aarch64/config.h +++ b/libraries/cmake/source/libxml2/config/linux/aarch64/config.h @@ -1,12 +1,12 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if __attribute__((destructor)) is accepted */ +/* A form that will not confuse apibuild.py */ #define ATTRIBUTE_DESTRUCTOR __attribute__((destructor)) /* Define to 1 if you have the header file. */ #define HAVE_ARPA_INET_H 1 +/* Define if __attribute__((destructor)) is accepted */ +#define HAVE_ATTRIBUTE_DESTRUCTOR 1 + /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 @@ -57,15 +57,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_POLL_H 1 -/* Define if is there */ +/* Define to 1 if you have the header file. */ #define HAVE_PTHREAD_H 1 -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - -/* Define to 1 if you have the `rand_r' function. */ -#define HAVE_RAND_R 1 - /* Have shl_load based dso */ /* #undef HAVE_SHLLOAD */ @@ -105,30 +99,6 @@ /* Whether __va_copy() is available */ #define HAVE___VA_COPY 1 -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR ".libs/" - -/* Name of package */ -#define PACKAGE "libxml2" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "xml@gnome.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "libxml2" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libxml2 2.11.2" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "libxml2" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "https://gitlab.gnome.org/GNOME/libxml2" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "2.11.2" - /* Support for IPv6 */ /* #undef SUPPORT_IP6 */ @@ -136,11 +106,14 @@ /* #undef VA_LIST_IS_ARRAY */ /* Version number of package */ -#define VERSION "2.11.2" +#define VERSION "2.12.3" /* Determine what socket length (socklen_t) data type is */ #define XML_SOCKLEN_T socklen_t +/* TLS specifier */ +/* #undef XML_THREAD_LOCAL */ + /* Define for Solaris 2.5.1 so the uint32_t typedef from , , or is not used. If the typedef were allowed, the #define below would cause a syntax error. */ diff --git a/libraries/cmake/source/libxml2/config/linux/x86_64/config.h b/libraries/cmake/source/libxml2/config/linux/x86_64/config.h index f9f221b8433..c29424e1972 100644 --- a/libraries/cmake/source/libxml2/config/linux/x86_64/config.h +++ b/libraries/cmake/source/libxml2/config/linux/x86_64/config.h @@ -1,12 +1,12 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if __attribute__((destructor)) is accepted */ +/* A form that will not confuse apibuild.py */ #define ATTRIBUTE_DESTRUCTOR __attribute__((destructor)) /* Define to 1 if you have the header file. */ #define HAVE_ARPA_INET_H 1 +/* Define if __attribute__((destructor)) is accepted */ +#define HAVE_ATTRIBUTE_DESTRUCTOR 1 + /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 @@ -57,15 +57,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_POLL_H 1 -/* Define if is there */ +/* Define to 1 if you have the header file. */ #define HAVE_PTHREAD_H 1 -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - -/* Define to 1 if you have the `rand_r' function. */ -#define HAVE_RAND_R 1 - /* Have shl_load based dso */ /* #undef HAVE_SHLLOAD */ @@ -105,30 +99,6 @@ /* Whether __va_copy() is available */ #define HAVE___VA_COPY 1 -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR ".libs/" - -/* Name of package */ -#define PACKAGE "libxml2" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "xml@gnome.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "libxml2" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libxml2 2.11.2" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "libxml2" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "https://gitlab.gnome.org/GNOME/libxml2" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "2.11.2" - /* Support for IPv6 */ /* #undef SUPPORT_IP6 */ @@ -136,11 +106,14 @@ #define VA_LIST_IS_ARRAY 1 /* Version number of package */ -#define VERSION "2.11.2" +#define VERSION "2.12.3" /* Determine what socket length (socklen_t) data type is */ #define XML_SOCKLEN_T socklen_t +/* TLS specifier */ +/* #undef XML_THREAD_LOCAL */ + /* Define for Solaris 2.5.1 so the uint32_t typedef from , , or is not used. If the typedef were allowed, the #define below would cause a syntax error. */ diff --git a/libraries/cmake/source/libxml2/config/macos/aarch64/config.h b/libraries/cmake/source/libxml2/config/macos/aarch64/config.h index 972e7dd1ab0..3ff86486a11 100644 --- a/libraries/cmake/source/libxml2/config/macos/aarch64/config.h +++ b/libraries/cmake/source/libxml2/config/macos/aarch64/config.h @@ -1,12 +1,12 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if __attribute__((destructor)) is accepted */ +/* A form that will not confuse apibuild.py */ #define ATTRIBUTE_DESTRUCTOR __attribute__((destructor)) /* Define to 1 if you have the header file. */ #define HAVE_ARPA_INET_H 1 +/* Define if __attribute__((destructor)) is accepted */ +#define HAVE_ATTRIBUTE_DESTRUCTOR 1 + /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 @@ -57,15 +57,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_POLL_H 1 -/* Define if is there */ +/* Define to 1 if you have the header file. */ #define HAVE_PTHREAD_H 1 -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - -/* Define to 1 if you have the `rand_r' function. */ -#define HAVE_RAND_R 1 - /* Have shl_load based dso */ /* #undef HAVE_SHLLOAD */ @@ -105,30 +99,6 @@ /* Whether __va_copy() is available */ #define HAVE___VA_COPY 1 -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR ".libs/" - -/* Name of package */ -#define PACKAGE "libxml2" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "xml@gnome.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "libxml2" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libxml2 2.11.2" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "libxml2" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "https://gitlab.gnome.org/GNOME/libxml2" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "2.11.2" - /* Support for IPv6 */ /* #undef SUPPORT_IP6 */ @@ -136,11 +106,14 @@ /* #undef VA_LIST_IS_ARRAY */ /* Version number of package */ -#define VERSION "2.11.2" +#define VERSION "2.12.3" /* Determine what socket length (socklen_t) data type is */ #define XML_SOCKLEN_T socklen_t +/* TLS specifier */ +/* #undef XML_THREAD_LOCAL */ + /* Define for Solaris 2.5.1 so the uint32_t typedef from , , or is not used. If the typedef were allowed, the #define below would cause a syntax error. */ diff --git a/libraries/cmake/source/libxml2/config/macos/x86_64/config.h b/libraries/cmake/source/libxml2/config/macos/x86_64/config.h index 21963445099..1a08a220fe9 100644 --- a/libraries/cmake/source/libxml2/config/macos/x86_64/config.h +++ b/libraries/cmake/source/libxml2/config/macos/x86_64/config.h @@ -1,12 +1,12 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define if __attribute__((destructor)) is accepted */ +/* A form that will not confuse apibuild.py */ #define ATTRIBUTE_DESTRUCTOR __attribute__((destructor)) /* Define to 1 if you have the header file. */ #define HAVE_ARPA_INET_H 1 +/* Define if __attribute__((destructor)) is accepted */ +#define HAVE_ATTRIBUTE_DESTRUCTOR 1 + /* Define to 1 if you have the header file. */ #define HAVE_DLFCN_H 1 @@ -57,15 +57,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_POLL_H 1 -/* Define if is there */ +/* Define to 1 if you have the header file. */ #define HAVE_PTHREAD_H 1 -/* Define to 1 if you have the `putenv' function. */ -#define HAVE_PUTENV 1 - -/* Define to 1 if you have the `rand_r' function. */ -#define HAVE_RAND_R 1 - /* Have shl_load based dso */ /* #undef HAVE_SHLLOAD */ @@ -105,30 +99,6 @@ /* Whether __va_copy() is available */ #define HAVE___VA_COPY 1 -/* Define to the sub-directory where libtool stores uninstalled libraries. */ -#define LT_OBJDIR ".libs/" - -/* Name of package */ -#define PACKAGE "libxml2" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "xml@gnome.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "libxml2" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "libxml2 2.11.2" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "libxml2" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "https://gitlab.gnome.org/GNOME/libxml2" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "2.11.2" - /* Support for IPv6 */ /* #undef SUPPORT_IP6 */ @@ -136,11 +106,14 @@ #define VA_LIST_IS_ARRAY 1 /* Version number of package */ -#define VERSION "2.11.2" +#define VERSION "2.12.3" /* Determine what socket length (socklen_t) data type is */ #define XML_SOCKLEN_T socklen_t +/* TLS specifier */ +/* #undef XML_THREAD_LOCAL */ + /* Define for Solaris 2.5.1 so the uint32_t typedef from , , or is not used. If the typedef were allowed, the #define below would cause a syntax error. */ diff --git a/libraries/cmake/source/libxml2/generated/version/linux/aarch64/libxml/xmlversion.h b/libraries/cmake/source/libxml2/generated/version/linux/aarch64/libxml/xmlversion.h index 4a1621825b5..87644410e31 100644 --- a/libraries/cmake/source/libxml2/generated/version/linux/aarch64/libxml/xmlversion.h +++ b/libraries/cmake/source/libxml2/generated/version/linux/aarch64/libxml/xmlversion.h @@ -29,21 +29,21 @@ XMLPUBFUN void xmlCheckVersion(int version); * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.11.2" +#define LIBXML_DOTTED_VERSION "2.12.3" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXML_VERSION 21102 +#define LIBXML_VERSION 21203 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXML_VERSION_STRING "21102" +#define LIBXML_VERSION_STRING "21203" /** * LIBXML_VERSION_EXTRA: @@ -58,7 +58,7 @@ XMLPUBFUN void xmlCheckVersion(int version); * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(21102); +#define LIBXML_TEST_VERSION xmlCheckVersion(21203); #ifndef VMS #if 0 @@ -449,43 +449,27 @@ XMLPUBFUN void xmlCheckVersion(int version); #endif #if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) -#define XML_IGNORE_FPTR_CAST_WARNINGS \ - _Pragma("GCC diagnostic push") \ - _Pragma("GCC diagnostic ignored \"-Wpedantic\"") \ - _Pragma("GCC diagnostic ignored \"-Wcast-function-type\"") -#define XML_POP_WARNINGS \ + #if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 800) + #define XML_IGNORE_FPTR_CAST_WARNINGS \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wpedantic\"") \ + _Pragma("GCC diagnostic ignored \"-Wcast-function-type\"") + #else + #define XML_IGNORE_FPTR_CAST_WARNINGS \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wpedantic\"") + #endif + #define XML_POP_WARNINGS \ _Pragma("GCC diagnostic pop") #else -#define XML_IGNORE_FPTR_CAST_WARNINGS -#define XML_POP_WARNINGS + #define XML_IGNORE_FPTR_CAST_WARNINGS + #define XML_POP_WARNINGS #endif -/** DOC_ENABLE */ #else /* ! __GNUC__ */ -/** - * ATTRIBUTE_UNUSED: - * - * Macro used to signal to GCC unused function parameters - */ #define ATTRIBUTE_UNUSED -/** - * LIBXML_ATTR_ALLOC_SIZE: - * - * Macro used to indicate to GCC this is an allocator function - */ #define LIBXML_ATTR_ALLOC_SIZE(x) -/** - * LIBXML_ATTR_FORMAT: - * - * Macro used to indicate to GCC the parameter are printf like - */ #define LIBXML_ATTR_FORMAT(fmt,args) -/** - * XML_DEPRECATED: - * - * Macro used to indicate that a function, variable, type or struct member - * is deprecated. - */ #ifndef XML_DEPRECATED # if defined (IN_LIBXML) || !defined (_MSC_VER) # define XML_DEPRECATED @@ -494,21 +478,11 @@ XMLPUBFUN void xmlCheckVersion(int version); # define XML_DEPRECATED __declspec(deprecated) # endif #endif -/** - * LIBXML_IGNORE_FPTR_CAST_WARNINGS: - * - * Macro used to ignore pointer cast warnings that can't be worked around. - */ #if defined (_MSC_VER) && (_MSC_VER >= 1400) # define XML_IGNORE_FPTR_CAST_WARNINGS __pragma(warning(push)) #else # define XML_IGNORE_FPTR_CAST_WARNINGS #endif -/** - * XML_POP_WARNINGS: - * - * Macro used to restore warnings state. - */ #ifndef XML_POP_WARNINGS # if defined (_MSC_VER) && (_MSC_VER >= 1400) # define XML_POP_WARNINGS __pragma(warning(pop)) @@ -518,6 +492,17 @@ XMLPUBFUN void xmlCheckVersion(int version); #endif #endif /* __GNUC__ */ +#define XML_NO_ATTR + +#ifdef LIBXML_THREAD_ENABLED + #define XML_DECLARE_GLOBAL(name, type, attrs) \ + attrs XMLPUBFUN type *__##name(void); + #define XML_GLOBAL_MACRO(name) (*__##name()) +#else + #define XML_DECLARE_GLOBAL(name, type, attrs) \ + attrs XMLPUBVAR type name; +#endif + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libraries/cmake/source/libxml2/generated/version/linux/x86_64/libxml/xmlversion.h b/libraries/cmake/source/libxml2/generated/version/linux/x86_64/libxml/xmlversion.h index 4a1621825b5..87644410e31 100644 --- a/libraries/cmake/source/libxml2/generated/version/linux/x86_64/libxml/xmlversion.h +++ b/libraries/cmake/source/libxml2/generated/version/linux/x86_64/libxml/xmlversion.h @@ -29,21 +29,21 @@ XMLPUBFUN void xmlCheckVersion(int version); * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.11.2" +#define LIBXML_DOTTED_VERSION "2.12.3" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXML_VERSION 21102 +#define LIBXML_VERSION 21203 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXML_VERSION_STRING "21102" +#define LIBXML_VERSION_STRING "21203" /** * LIBXML_VERSION_EXTRA: @@ -58,7 +58,7 @@ XMLPUBFUN void xmlCheckVersion(int version); * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(21102); +#define LIBXML_TEST_VERSION xmlCheckVersion(21203); #ifndef VMS #if 0 @@ -449,43 +449,27 @@ XMLPUBFUN void xmlCheckVersion(int version); #endif #if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) -#define XML_IGNORE_FPTR_CAST_WARNINGS \ - _Pragma("GCC diagnostic push") \ - _Pragma("GCC diagnostic ignored \"-Wpedantic\"") \ - _Pragma("GCC diagnostic ignored \"-Wcast-function-type\"") -#define XML_POP_WARNINGS \ + #if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 800) + #define XML_IGNORE_FPTR_CAST_WARNINGS \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wpedantic\"") \ + _Pragma("GCC diagnostic ignored \"-Wcast-function-type\"") + #else + #define XML_IGNORE_FPTR_CAST_WARNINGS \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wpedantic\"") + #endif + #define XML_POP_WARNINGS \ _Pragma("GCC diagnostic pop") #else -#define XML_IGNORE_FPTR_CAST_WARNINGS -#define XML_POP_WARNINGS + #define XML_IGNORE_FPTR_CAST_WARNINGS + #define XML_POP_WARNINGS #endif -/** DOC_ENABLE */ #else /* ! __GNUC__ */ -/** - * ATTRIBUTE_UNUSED: - * - * Macro used to signal to GCC unused function parameters - */ #define ATTRIBUTE_UNUSED -/** - * LIBXML_ATTR_ALLOC_SIZE: - * - * Macro used to indicate to GCC this is an allocator function - */ #define LIBXML_ATTR_ALLOC_SIZE(x) -/** - * LIBXML_ATTR_FORMAT: - * - * Macro used to indicate to GCC the parameter are printf like - */ #define LIBXML_ATTR_FORMAT(fmt,args) -/** - * XML_DEPRECATED: - * - * Macro used to indicate that a function, variable, type or struct member - * is deprecated. - */ #ifndef XML_DEPRECATED # if defined (IN_LIBXML) || !defined (_MSC_VER) # define XML_DEPRECATED @@ -494,21 +478,11 @@ XMLPUBFUN void xmlCheckVersion(int version); # define XML_DEPRECATED __declspec(deprecated) # endif #endif -/** - * LIBXML_IGNORE_FPTR_CAST_WARNINGS: - * - * Macro used to ignore pointer cast warnings that can't be worked around. - */ #if defined (_MSC_VER) && (_MSC_VER >= 1400) # define XML_IGNORE_FPTR_CAST_WARNINGS __pragma(warning(push)) #else # define XML_IGNORE_FPTR_CAST_WARNINGS #endif -/** - * XML_POP_WARNINGS: - * - * Macro used to restore warnings state. - */ #ifndef XML_POP_WARNINGS # if defined (_MSC_VER) && (_MSC_VER >= 1400) # define XML_POP_WARNINGS __pragma(warning(pop)) @@ -518,6 +492,17 @@ XMLPUBFUN void xmlCheckVersion(int version); #endif #endif /* __GNUC__ */ +#define XML_NO_ATTR + +#ifdef LIBXML_THREAD_ENABLED + #define XML_DECLARE_GLOBAL(name, type, attrs) \ + attrs XMLPUBFUN type *__##name(void); + #define XML_GLOBAL_MACRO(name) (*__##name()) +#else + #define XML_DECLARE_GLOBAL(name, type, attrs) \ + attrs XMLPUBVAR type name; +#endif + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libraries/cmake/source/libxml2/generated/version/macos/aarch64/libxml/xmlversion.h b/libraries/cmake/source/libxml2/generated/version/macos/aarch64/libxml/xmlversion.h index feb5cb0c5da..928dd22aac7 100644 --- a/libraries/cmake/source/libxml2/generated/version/macos/aarch64/libxml/xmlversion.h +++ b/libraries/cmake/source/libxml2/generated/version/macos/aarch64/libxml/xmlversion.h @@ -29,21 +29,21 @@ XMLPUBFUN void xmlCheckVersion(int version); * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.11.2" +#define LIBXML_DOTTED_VERSION "2.12.3" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXML_VERSION 21102 +#define LIBXML_VERSION 21203 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXML_VERSION_STRING "21102" +#define LIBXML_VERSION_STRING "21203" /** * LIBXML_VERSION_EXTRA: @@ -58,7 +58,7 @@ XMLPUBFUN void xmlCheckVersion(int version); * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(21102); +#define LIBXML_TEST_VERSION xmlCheckVersion(21203); #ifndef VMS #if 0 @@ -449,43 +449,27 @@ XMLPUBFUN void xmlCheckVersion(int version); #endif #if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) -#define XML_IGNORE_FPTR_CAST_WARNINGS \ - _Pragma("GCC diagnostic push") \ - _Pragma("GCC diagnostic ignored \"-Wpedantic\"") \ - _Pragma("GCC diagnostic ignored \"-Wcast-function-type\"") -#define XML_POP_WARNINGS \ + #if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 800) + #define XML_IGNORE_FPTR_CAST_WARNINGS \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wpedantic\"") \ + _Pragma("GCC diagnostic ignored \"-Wcast-function-type\"") + #else + #define XML_IGNORE_FPTR_CAST_WARNINGS \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wpedantic\"") + #endif + #define XML_POP_WARNINGS \ _Pragma("GCC diagnostic pop") #else -#define XML_IGNORE_FPTR_CAST_WARNINGS -#define XML_POP_WARNINGS + #define XML_IGNORE_FPTR_CAST_WARNINGS + #define XML_POP_WARNINGS #endif -/** DOC_ENABLE */ #else /* ! __GNUC__ */ -/** - * ATTRIBUTE_UNUSED: - * - * Macro used to signal to GCC unused function parameters - */ #define ATTRIBUTE_UNUSED -/** - * LIBXML_ATTR_ALLOC_SIZE: - * - * Macro used to indicate to GCC this is an allocator function - */ #define LIBXML_ATTR_ALLOC_SIZE(x) -/** - * LIBXML_ATTR_FORMAT: - * - * Macro used to indicate to GCC the parameter are printf like - */ #define LIBXML_ATTR_FORMAT(fmt,args) -/** - * XML_DEPRECATED: - * - * Macro used to indicate that a function, variable, type or struct member - * is deprecated. - */ #ifndef XML_DEPRECATED # if defined (IN_LIBXML) || !defined (_MSC_VER) # define XML_DEPRECATED @@ -494,21 +478,11 @@ XMLPUBFUN void xmlCheckVersion(int version); # define XML_DEPRECATED __declspec(deprecated) # endif #endif -/** - * LIBXML_IGNORE_FPTR_CAST_WARNINGS: - * - * Macro used to ignore pointer cast warnings that can't be worked around. - */ #if defined (_MSC_VER) && (_MSC_VER >= 1400) # define XML_IGNORE_FPTR_CAST_WARNINGS __pragma(warning(push)) #else # define XML_IGNORE_FPTR_CAST_WARNINGS #endif -/** - * XML_POP_WARNINGS: - * - * Macro used to restore warnings state. - */ #ifndef XML_POP_WARNINGS # if defined (_MSC_VER) && (_MSC_VER >= 1400) # define XML_POP_WARNINGS __pragma(warning(pop)) @@ -518,6 +492,17 @@ XMLPUBFUN void xmlCheckVersion(int version); #endif #endif /* __GNUC__ */ +#define XML_NO_ATTR + +#ifdef LIBXML_THREAD_ENABLED + #define XML_DECLARE_GLOBAL(name, type, attrs) \ + attrs XMLPUBFUN type *__##name(void); + #define XML_GLOBAL_MACRO(name) (*__##name()) +#else + #define XML_DECLARE_GLOBAL(name, type, attrs) \ + attrs XMLPUBVAR type name; +#endif + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libraries/cmake/source/libxml2/generated/version/macos/x86_64/libxml/xmlversion.h b/libraries/cmake/source/libxml2/generated/version/macos/x86_64/libxml/xmlversion.h index feb5cb0c5da..928dd22aac7 100644 --- a/libraries/cmake/source/libxml2/generated/version/macos/x86_64/libxml/xmlversion.h +++ b/libraries/cmake/source/libxml2/generated/version/macos/x86_64/libxml/xmlversion.h @@ -29,21 +29,21 @@ XMLPUBFUN void xmlCheckVersion(int version); * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.11.2" +#define LIBXML_DOTTED_VERSION "2.12.3" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXML_VERSION 21102 +#define LIBXML_VERSION 21203 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXML_VERSION_STRING "21102" +#define LIBXML_VERSION_STRING "21203" /** * LIBXML_VERSION_EXTRA: @@ -58,7 +58,7 @@ XMLPUBFUN void xmlCheckVersion(int version); * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(21102); +#define LIBXML_TEST_VERSION xmlCheckVersion(21203); #ifndef VMS #if 0 @@ -449,43 +449,27 @@ XMLPUBFUN void xmlCheckVersion(int version); #endif #if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) -#define XML_IGNORE_FPTR_CAST_WARNINGS \ - _Pragma("GCC diagnostic push") \ - _Pragma("GCC diagnostic ignored \"-Wpedantic\"") \ - _Pragma("GCC diagnostic ignored \"-Wcast-function-type\"") -#define XML_POP_WARNINGS \ + #if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 800) + #define XML_IGNORE_FPTR_CAST_WARNINGS \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wpedantic\"") \ + _Pragma("GCC diagnostic ignored \"-Wcast-function-type\"") + #else + #define XML_IGNORE_FPTR_CAST_WARNINGS \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wpedantic\"") + #endif + #define XML_POP_WARNINGS \ _Pragma("GCC diagnostic pop") #else -#define XML_IGNORE_FPTR_CAST_WARNINGS -#define XML_POP_WARNINGS + #define XML_IGNORE_FPTR_CAST_WARNINGS + #define XML_POP_WARNINGS #endif -/** DOC_ENABLE */ #else /* ! __GNUC__ */ -/** - * ATTRIBUTE_UNUSED: - * - * Macro used to signal to GCC unused function parameters - */ #define ATTRIBUTE_UNUSED -/** - * LIBXML_ATTR_ALLOC_SIZE: - * - * Macro used to indicate to GCC this is an allocator function - */ #define LIBXML_ATTR_ALLOC_SIZE(x) -/** - * LIBXML_ATTR_FORMAT: - * - * Macro used to indicate to GCC the parameter are printf like - */ #define LIBXML_ATTR_FORMAT(fmt,args) -/** - * XML_DEPRECATED: - * - * Macro used to indicate that a function, variable, type or struct member - * is deprecated. - */ #ifndef XML_DEPRECATED # if defined (IN_LIBXML) || !defined (_MSC_VER) # define XML_DEPRECATED @@ -494,21 +478,11 @@ XMLPUBFUN void xmlCheckVersion(int version); # define XML_DEPRECATED __declspec(deprecated) # endif #endif -/** - * LIBXML_IGNORE_FPTR_CAST_WARNINGS: - * - * Macro used to ignore pointer cast warnings that can't be worked around. - */ #if defined (_MSC_VER) && (_MSC_VER >= 1400) # define XML_IGNORE_FPTR_CAST_WARNINGS __pragma(warning(push)) #else # define XML_IGNORE_FPTR_CAST_WARNINGS #endif -/** - * XML_POP_WARNINGS: - * - * Macro used to restore warnings state. - */ #ifndef XML_POP_WARNINGS # if defined (_MSC_VER) && (_MSC_VER >= 1400) # define XML_POP_WARNINGS __pragma(warning(pop)) @@ -518,6 +492,17 @@ XMLPUBFUN void xmlCheckVersion(int version); #endif #endif /* __GNUC__ */ +#define XML_NO_ATTR + +#ifdef LIBXML_THREAD_ENABLED + #define XML_DECLARE_GLOBAL(name, type, attrs) \ + attrs XMLPUBFUN type *__##name(void); + #define XML_GLOBAL_MACRO(name) (*__##name()) +#else + #define XML_DECLARE_GLOBAL(name, type, attrs) \ + attrs XMLPUBVAR type name; +#endif + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libraries/cmake/source/libxml2/generated/version/windows/aarch64/libxml/xmlversion.h b/libraries/cmake/source/libxml2/generated/version/windows/aarch64/libxml/xmlversion.h index f8b7a972884..1124bc22cad 100644 --- a/libraries/cmake/source/libxml2/generated/version/windows/aarch64/libxml/xmlversion.h +++ b/libraries/cmake/source/libxml2/generated/version/windows/aarch64/libxml/xmlversion.h @@ -1,526 +1,509 @@ -/* - * Summary: compile-time version information - * Description: compile-time version information for the XML library - * - * Copy: See Copyright for the status of this software. - * - * Author: Daniel Veillard - */ - -#ifndef __XML_VERSION_H__ -#define __XML_VERSION_H__ - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * use those to be sure nothing nasty will happen if - * your library and includes mismatch - */ -#ifndef LIBXML2_COMPILING_MSCCDEF -XMLPUBFUN void xmlCheckVersion(int version); -#endif /* LIBXML2_COMPILING_MSCCDEF */ - -/** - * LIBXML_DOTTED_VERSION: - * - * the version string like "1.2.3" - */ -#define LIBXML_DOTTED_VERSION "2.11.2" - -/** - * LIBXML_VERSION: - * - * the version number: 1.2.3 value is 10203 - */ -#define LIBXML_VERSION 21102 - -/** - * LIBXML_VERSION_STRING: - * - * the version number string, 1.2.3 value is "10203" - */ -#define LIBXML_VERSION_STRING "21102" - -/** - * LIBXML_VERSION_EXTRA: - * - * extra version information, used to show a git commit description - */ -#define LIBXML_VERSION_EXTRA "" - -/** - * LIBXML_TEST_VERSION: - * - * Macro to check that the libxml version in use is compatible with - * the version the software has been compiled against - */ -#define LIBXML_TEST_VERSION xmlCheckVersion(21102); - -#ifndef VMS -#if 0 -/** - * WITH_TRIO: - * - * defined if the trio support need to be configured in - */ -#define WITH_TRIO -#else -/** - * WITHOUT_TRIO: - * - * defined if the trio support should not be configured in - */ -#define WITHOUT_TRIO -#endif -#else /* VMS */ -/** - * WITH_TRIO: - * - * defined if the trio support need to be configured in - */ -#define WITH_TRIO 1 -#endif /* VMS */ - -/** - * LIBXML_THREAD_ENABLED: - * - * Whether the thread support is configured in - */ -#if 1 -#define LIBXML_THREAD_ENABLED -#endif - -/** - * LIBXML_THREAD_ALLOC_ENABLED: - * - * Whether the allocation hooks are per-thread - */ -#if 0 -#define LIBXML_THREAD_ALLOC_ENABLED -#endif - -/** - * LIBXML_TREE_ENABLED: - * - * Whether the DOM like tree manipulation API support is configured in - */ -#if 1 -#define LIBXML_TREE_ENABLED -#endif - -/** - * LIBXML_OUTPUT_ENABLED: - * - * Whether the serialization/saving support is configured in - */ -#if 1 -#define LIBXML_OUTPUT_ENABLED -#endif - -/** - * LIBXML_PUSH_ENABLED: - * - * Whether the push parsing interfaces are configured in - */ -#if 1 -#define LIBXML_PUSH_ENABLED -#endif - -/** - * LIBXML_READER_ENABLED: - * - * Whether the xmlReader parsing interface is configured in - */ -#if 1 -#define LIBXML_READER_ENABLED -#endif - -/** - * LIBXML_PATTERN_ENABLED: - * - * Whether the xmlPattern node selection interface is configured in - */ -#if 1 -#define LIBXML_PATTERN_ENABLED -#endif - -/** - * LIBXML_WRITER_ENABLED: - * - * Whether the xmlWriter saving interface is configured in - */ -#if 1 -#define LIBXML_WRITER_ENABLED -#endif - -/** - * LIBXML_SAX1_ENABLED: - * - * Whether the older SAX1 interface is configured in - */ -#if 0 -#define LIBXML_SAX1_ENABLED -#endif - -/** - * LIBXML_FTP_ENABLED: - * - * Whether the FTP support is configured in - */ -#if 0 -#define LIBXML_FTP_ENABLED -#endif - -/** - * LIBXML_HTTP_ENABLED: - * - * Whether the HTTP support is configured in - */ -#if 0 -#define LIBXML_HTTP_ENABLED -#endif - -/** - * LIBXML_VALID_ENABLED: - * - * Whether the DTD validation support is configured in - */ -#if 0 -#define LIBXML_VALID_ENABLED -#endif - -/** - * LIBXML_HTML_ENABLED: - * - * Whether the HTML support is configured in - */ -#if 0 -#define LIBXML_HTML_ENABLED -#endif - -/** - * LIBXML_LEGACY_ENABLED: - * - * Whether the deprecated APIs are compiled in for compatibility - */ -#if 0 -#define LIBXML_LEGACY_ENABLED -#endif - -/** - * LIBXML_C14N_ENABLED: - * - * Whether the Canonicalization support is configured in - */ -#if 1 -#define LIBXML_C14N_ENABLED -#endif - -/** - * LIBXML_CATALOG_ENABLED: - * - * Whether the Catalog support is configured in - */ -#if 0 -#define LIBXML_CATALOG_ENABLED -#endif - -/** - * LIBXML_XPATH_ENABLED: - * - * Whether XPath is configured in - */ -#if 1 -#define LIBXML_XPATH_ENABLED -#endif - -/** - * LIBXML_XPTR_ENABLED: - * - * Whether XPointer is configured in - */ -#if 1 -#define LIBXML_XPTR_ENABLED -#endif - -/** - * LIBXML_XPTR_LOCS_ENABLED: - * - * Whether support for XPointer locations is configured in - */ -#if 0 -#define LIBXML_XPTR_LOCS_ENABLED -#endif - -/** - * LIBXML_XINCLUDE_ENABLED: - * - * Whether XInclude is configured in - */ -#if 0 -#define LIBXML_XINCLUDE_ENABLED -#endif - -/** - * LIBXML_ICONV_ENABLED: - * - * Whether iconv support is available - */ -#if 0 -#define LIBXML_ICONV_ENABLED -#endif - -/** - * LIBXML_ICU_ENABLED: - * - * Whether icu support is available - */ -#if 0 -#define LIBXML_ICU_ENABLED -#endif - -/** - * LIBXML_ISO8859X_ENABLED: - * - * Whether ISO-8859-* support is made available in case iconv is not - */ -#if 0 -#define LIBXML_ISO8859X_ENABLED -#endif - -/** - * LIBXML_DEBUG_ENABLED: - * - * Whether Debugging module is configured in - */ -#if 0 -#define LIBXML_DEBUG_ENABLED -#endif - -/** - * DEBUG_MEMORY_LOCATION: - * - * Whether the memory debugging is configured in - */ -#if 0 -#define DEBUG_MEMORY_LOCATION -#endif - -/** - * LIBXML_DEBUG_RUNTIME: - * - * Removed - */ -#if 0 -#define LIBXML_DEBUG_RUNTIME -#endif - -/** - * LIBXML_UNICODE_ENABLED: - * - * Whether the Unicode related interfaces are compiled in - */ -#if 1 -#define LIBXML_UNICODE_ENABLED -#endif - -/** - * LIBXML_REGEXP_ENABLED: - * - * Whether the regular expressions interfaces are compiled in - */ -#if 1 -#define LIBXML_REGEXP_ENABLED -#endif - -/** - * LIBXML_AUTOMATA_ENABLED: - * - * Whether the automata interfaces are compiled in - */ -#if 1 -#define LIBXML_AUTOMATA_ENABLED -#endif - -/** - * LIBXML_EXPR_ENABLED: - * - * Whether the formal expressions interfaces are compiled in - * - * This code is unused and disabled unconditionally for now. - */ -#if 0 -#define LIBXML_EXPR_ENABLED -#endif - -/** - * LIBXML_SCHEMAS_ENABLED: - * - * Whether the Schemas validation interfaces are compiled in - */ -#if 0 -#define LIBXML_SCHEMAS_ENABLED -#endif - -/** - * LIBXML_SCHEMATRON_ENABLED: - * - * Whether the Schematron validation interfaces are compiled in - */ -#if 0 -#define LIBXML_SCHEMATRON_ENABLED -#endif - -/** - * LIBXML_MODULES_ENABLED: - * - * Whether the module interfaces are compiled in - */ -#if 0 -#define LIBXML_MODULES_ENABLED -/** - * LIBXML_MODULE_EXTENSION: - * - * the string suffix used by dynamic modules (usually shared libraries) - */ -#define LIBXML_MODULE_EXTENSION ".dll" -#endif - -/** - * LIBXML_ZLIB_ENABLED: - * - * Whether the Zlib support is compiled in - */ -#if 1 -#define LIBXML_ZLIB_ENABLED -#endif - -/** - * LIBXML_LZMA_ENABLED: - * - * Whether the Lzma support is compiled in - */ -#if 0 -#define LIBXML_LZMA_ENABLED -#endif - -#ifdef __GNUC__ -/** DOC_DISABLE */ - -#ifndef ATTRIBUTE_UNUSED -# if ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7))) -# define ATTRIBUTE_UNUSED __attribute__((unused)) -# else -# define ATTRIBUTE_UNUSED -# endif -#endif - -#ifndef LIBXML_ATTR_ALLOC_SIZE -# if (!defined(__clang__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))) -# define LIBXML_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x))) -# else -# define LIBXML_ATTR_ALLOC_SIZE(x) -# endif -#else -# define LIBXML_ATTR_ALLOC_SIZE(x) -#endif - -#ifndef LIBXML_ATTR_FORMAT -# if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) -# define LIBXML_ATTR_FORMAT(fmt,args) __attribute__((__format__(__printf__,fmt,args))) -# else -# define LIBXML_ATTR_FORMAT(fmt,args) -# endif -#else -# define LIBXML_ATTR_FORMAT(fmt,args) -#endif - -#ifndef XML_DEPRECATED -# if defined (IN_LIBXML) || (__GNUC__ * 100 + __GNUC_MINOR__ < 301) -# define XML_DEPRECATED -/* Available since at least GCC 3.1 */ -# else -# define XML_DEPRECATED __attribute__((deprecated)) -# endif -#endif - -#if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) -#define XML_IGNORE_FPTR_CAST_WARNINGS \ - _Pragma("GCC diagnostic push") \ - _Pragma("GCC diagnostic ignored \"-Wpedantic\"") \ - _Pragma("GCC diagnostic ignored \"-Wcast-function-type\"") -#define XML_POP_WARNINGS \ - _Pragma("GCC diagnostic pop") -#else -#define XML_IGNORE_FPTR_CAST_WARNINGS -#define XML_POP_WARNINGS -#endif - -/** DOC_ENABLE */ -#else /* ! __GNUC__ */ -/** - * ATTRIBUTE_UNUSED: - * - * Macro used to signal to GCC unused function parameters - */ -#define ATTRIBUTE_UNUSED -/** - * LIBXML_ATTR_ALLOC_SIZE: - * - * Macro used to indicate to GCC this is an allocator function - */ -#define LIBXML_ATTR_ALLOC_SIZE(x) -/** - * LIBXML_ATTR_FORMAT: - * - * Macro used to indicate to GCC the parameter are printf like - */ -#define LIBXML_ATTR_FORMAT(fmt,args) -/** - * XML_DEPRECATED: - * - * Macro used to indicate that a function, variable, type or struct member - * is deprecated. - */ -#ifndef XML_DEPRECATED -# if defined (IN_LIBXML) || !defined (_MSC_VER) -# define XML_DEPRECATED -/* Available since Visual Studio 2005 */ -# elif defined (_MSC_VER) && (_MSC_VER >= 1400) -# define XML_DEPRECATED __declspec(deprecated) -# endif -#endif -/** - * LIBXML_IGNORE_FPTR_CAST_WARNINGS: - * - * Macro used to ignore pointer cast warnings that can't be worked around. - */ -#if defined (_MSC_VER) && (_MSC_VER >= 1400) -# define XML_IGNORE_FPTR_CAST_WARNINGS __pragma(warning(push)) -#else -# define XML_IGNORE_FPTR_CAST_WARNINGS -#endif -/** - * XML_POP_WARNINGS: - * - * Macro used to restore warnings state. - */ -#ifndef XML_POP_WARNINGS -# if defined (_MSC_VER) && (_MSC_VER >= 1400) -# define XML_POP_WARNINGS __pragma(warning(pop)) -# else -# define XML_POP_WARNINGS -# endif -#endif -#endif /* __GNUC__ */ - -#ifdef __cplusplus -} -#endif /* __cplusplus */ -#endif - - +/* + * Summary: compile-time version information + * Description: compile-time version information for the XML library + * + * Copy: See Copyright for the status of this software. + * + * Author: Daniel Veillard + */ + +#ifndef __XML_VERSION_H__ +#define __XML_VERSION_H__ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * use those to be sure nothing nasty will happen if + * your library and includes mismatch + */ +#ifndef LIBXML2_COMPILING_MSCCDEF +XMLPUBFUN void xmlCheckVersion(int version); +#endif /* LIBXML2_COMPILING_MSCCDEF */ + +/** + * LIBXML_DOTTED_VERSION: + * + * the version string like "1.2.3" + */ +#define LIBXML_DOTTED_VERSION "2.12.3" + +/** + * LIBXML_VERSION: + * + * the version number: 1.2.3 value is 10203 + */ +#define LIBXML_VERSION 21203 + +/** + * LIBXML_VERSION_STRING: + * + * the version number string, 1.2.3 value is "10203" + */ +#define LIBXML_VERSION_STRING "21203" + +/** + * LIBXML_VERSION_EXTRA: + * + * extra version information, used to show a git commit description + */ +#define LIBXML_VERSION_EXTRA "" + +/** + * LIBXML_TEST_VERSION: + * + * Macro to check that the libxml version in use is compatible with + * the version the software has been compiled against + */ +#define LIBXML_TEST_VERSION xmlCheckVersion(21203); + +#ifndef VMS +#if 0 +/** + * WITH_TRIO: + * + * defined if the trio support need to be configured in + */ +#define WITH_TRIO +#else +/** + * WITHOUT_TRIO: + * + * defined if the trio support should not be configured in + */ +#define WITHOUT_TRIO +#endif +#else /* VMS */ +/** + * WITH_TRIO: + * + * defined if the trio support need to be configured in + */ +#define WITH_TRIO 1 +#endif /* VMS */ + +/** + * LIBXML_THREAD_ENABLED: + * + * Whether the thread support is configured in + */ +#if 1 +#define LIBXML_THREAD_ENABLED +#endif + +/** + * LIBXML_THREAD_ALLOC_ENABLED: + * + * Whether the allocation hooks are per-thread + */ +#if 0 +#define LIBXML_THREAD_ALLOC_ENABLED +#endif + +/** + * LIBXML_TREE_ENABLED: + * + * Whether the DOM like tree manipulation API support is configured in + */ +#if 1 +#define LIBXML_TREE_ENABLED +#endif + +/** + * LIBXML_OUTPUT_ENABLED: + * + * Whether the serialization/saving support is configured in + */ +#if 1 +#define LIBXML_OUTPUT_ENABLED +#endif + +/** + * LIBXML_PUSH_ENABLED: + * + * Whether the push parsing interfaces are configured in + */ +#if 1 +#define LIBXML_PUSH_ENABLED +#endif + +/** + * LIBXML_READER_ENABLED: + * + * Whether the xmlReader parsing interface is configured in + */ +#if 1 +#define LIBXML_READER_ENABLED +#endif + +/** + * LIBXML_PATTERN_ENABLED: + * + * Whether the xmlPattern node selection interface is configured in + */ +#if 1 +#define LIBXML_PATTERN_ENABLED +#endif + +/** + * LIBXML_WRITER_ENABLED: + * + * Whether the xmlWriter saving interface is configured in + */ +#if 1 +#define LIBXML_WRITER_ENABLED +#endif + +/** + * LIBXML_SAX1_ENABLED: + * + * Whether the older SAX1 interface is configured in + */ +#if 0 +#define LIBXML_SAX1_ENABLED +#endif + +/** + * LIBXML_FTP_ENABLED: + * + * Whether the FTP support is configured in + */ +#if 0 +#define LIBXML_FTP_ENABLED +#endif + +/** + * LIBXML_HTTP_ENABLED: + * + * Whether the HTTP support is configured in + */ +#if 0 +#define LIBXML_HTTP_ENABLED +#endif + +/** + * LIBXML_VALID_ENABLED: + * + * Whether the DTD validation support is configured in + */ +#if 0 +#define LIBXML_VALID_ENABLED +#endif + +/** + * LIBXML_HTML_ENABLED: + * + * Whether the HTML support is configured in + */ +#if 0 +#define LIBXML_HTML_ENABLED +#endif + +/** + * LIBXML_LEGACY_ENABLED: + * + * Whether the deprecated APIs are compiled in for compatibility + */ +#if 0 +#define LIBXML_LEGACY_ENABLED +#endif + +/** + * LIBXML_C14N_ENABLED: + * + * Whether the Canonicalization support is configured in + */ +#if 1 +#define LIBXML_C14N_ENABLED +#endif + +/** + * LIBXML_CATALOG_ENABLED: + * + * Whether the Catalog support is configured in + */ +#if 0 +#define LIBXML_CATALOG_ENABLED +#endif + +/** + * LIBXML_XPATH_ENABLED: + * + * Whether XPath is configured in + */ +#if 1 +#define LIBXML_XPATH_ENABLED +#endif + +/** + * LIBXML_XPTR_ENABLED: + * + * Whether XPointer is configured in + */ +#if 1 +#define LIBXML_XPTR_ENABLED +#endif + +/** + * LIBXML_XPTR_LOCS_ENABLED: + * + * Whether support for XPointer locations is configured in + */ +#if 0 +#define LIBXML_XPTR_LOCS_ENABLED +#endif + +/** + * LIBXML_XINCLUDE_ENABLED: + * + * Whether XInclude is configured in + */ +#if 0 +#define LIBXML_XINCLUDE_ENABLED +#endif + +/** + * LIBXML_ICONV_ENABLED: + * + * Whether iconv support is available + */ +#if 0 +#define LIBXML_ICONV_ENABLED +#endif + +/** + * LIBXML_ICU_ENABLED: + * + * Whether icu support is available + */ +#if 0 +#define LIBXML_ICU_ENABLED +#endif + +/** + * LIBXML_ISO8859X_ENABLED: + * + * Whether ISO-8859-* support is made available in case iconv is not + */ +#if 0 +#define LIBXML_ISO8859X_ENABLED +#endif + +/** + * LIBXML_DEBUG_ENABLED: + * + * Whether Debugging module is configured in + */ +#if 0 +#define LIBXML_DEBUG_ENABLED +#endif + +/** + * DEBUG_MEMORY_LOCATION: + * + * Whether the memory debugging is configured in + */ +#if 0 +#define DEBUG_MEMORY_LOCATION +#endif + +/** + * LIBXML_DEBUG_RUNTIME: + * + * Removed + */ +#if 0 +#define LIBXML_DEBUG_RUNTIME +#endif + +/** + * LIBXML_UNICODE_ENABLED: + * + * Whether the Unicode related interfaces are compiled in + */ +#if 1 +#define LIBXML_UNICODE_ENABLED +#endif + +/** + * LIBXML_REGEXP_ENABLED: + * + * Whether the regular expressions interfaces are compiled in + */ +#if 1 +#define LIBXML_REGEXP_ENABLED +#endif + +/** + * LIBXML_AUTOMATA_ENABLED: + * + * Whether the automata interfaces are compiled in + */ +#if 1 +#define LIBXML_AUTOMATA_ENABLED +#endif + +/** + * LIBXML_EXPR_ENABLED: + * + * Whether the formal expressions interfaces are compiled in + * + * This code is unused and disabled unconditionally for now. + */ +#if 0 +#define LIBXML_EXPR_ENABLED +#endif + +/** + * LIBXML_SCHEMAS_ENABLED: + * + * Whether the Schemas validation interfaces are compiled in + */ +#if 0 +#define LIBXML_SCHEMAS_ENABLED +#endif + +/** + * LIBXML_SCHEMATRON_ENABLED: + * + * Whether the Schematron validation interfaces are compiled in + */ +#if 0 +#define LIBXML_SCHEMATRON_ENABLED +#endif + +/** + * LIBXML_MODULES_ENABLED: + * + * Whether the module interfaces are compiled in + */ +#if 0 +#define LIBXML_MODULES_ENABLED +/** + * LIBXML_MODULE_EXTENSION: + * + * the string suffix used by dynamic modules (usually shared libraries) + */ +#define LIBXML_MODULE_EXTENSION ".dll" +#endif + +/** + * LIBXML_ZLIB_ENABLED: + * + * Whether the Zlib support is compiled in + */ +#if 1 +#define LIBXML_ZLIB_ENABLED +#endif + +/** + * LIBXML_LZMA_ENABLED: + * + * Whether the Lzma support is compiled in + */ +#if 0 +#define LIBXML_LZMA_ENABLED +#endif + +#ifdef __GNUC__ +/** DOC_DISABLE */ + +#ifndef ATTRIBUTE_UNUSED +#if ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7))) +#define ATTRIBUTE_UNUSED __attribute__((unused)) +#else +#define ATTRIBUTE_UNUSED +#endif +#endif + +#ifndef LIBXML_ATTR_ALLOC_SIZE +#if (!defined(__clang__) && \ + ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)))) +#define LIBXML_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x))) +#else +#define LIBXML_ATTR_ALLOC_SIZE(x) +#endif +#else +#define LIBXML_ATTR_ALLOC_SIZE(x) +#endif + +#ifndef LIBXML_ATTR_FORMAT +#if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) +#define LIBXML_ATTR_FORMAT(fmt, args) \ + __attribute__((__format__(__printf__, fmt, args))) +#else +#define LIBXML_ATTR_FORMAT(fmt, args) +#endif +#else +#define LIBXML_ATTR_FORMAT(fmt, args) +#endif + +#ifndef XML_DEPRECATED +#if defined(IN_LIBXML) || (__GNUC__ * 100 + __GNUC_MINOR__ < 301) +#define XML_DEPRECATED +/* Available since at least GCC 3.1 */ +#else +#define XML_DEPRECATED __attribute__((deprecated)) +#endif +#endif + +#if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) +#if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 800) +#define XML_IGNORE_FPTR_CAST_WARNINGS \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wpedantic\"") \ + _Pragma("GCC diagnostic ignored \"-Wcast-function-type\"") +#else +#define XML_IGNORE_FPTR_CAST_WARNINGS \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wpedantic\"") +#endif +#define XML_POP_WARNINGS _Pragma("GCC diagnostic pop") +#else +#define XML_IGNORE_FPTR_CAST_WARNINGS +#define XML_POP_WARNINGS +#endif + +#else /* ! __GNUC__ */ +#define ATTRIBUTE_UNUSED +#define LIBXML_ATTR_ALLOC_SIZE(x) +#define LIBXML_ATTR_FORMAT(fmt, args) +#ifndef XML_DEPRECATED +#if defined(IN_LIBXML) || !defined(_MSC_VER) +#define XML_DEPRECATED +/* Available since Visual Studio 2005 */ +#elif defined(_MSC_VER) && (_MSC_VER >= 1400) +#define XML_DEPRECATED __declspec(deprecated) +#endif +#endif +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#define XML_IGNORE_FPTR_CAST_WARNINGS __pragma(warning(push)) +#else +#define XML_IGNORE_FPTR_CAST_WARNINGS +#endif +#ifndef XML_POP_WARNINGS +#if defined(_MSC_VER) && (_MSC_VER >= 1400) +#define XML_POP_WARNINGS __pragma(warning(pop)) +#else +#define XML_POP_WARNINGS +#endif +#endif +#endif /* __GNUC__ */ + +#define XML_NO_ATTR + +#ifdef LIBXML_THREAD_ENABLED +#define XML_DECLARE_GLOBAL(name, type, attrs) \ + attrs XMLPUBFUN type* __##name(void); +#define XML_GLOBAL_MACRO(name) (*__##name()) +#else +#define XML_DECLARE_GLOBAL(name, type, attrs) attrs XMLPUBVAR type name; +#endif + +#ifdef __cplusplus +} +#endif /* __cplusplus */ +#endif diff --git a/libraries/cmake/source/libxml2/generated/version/windows/x86_64/libxml/xmlversion.h b/libraries/cmake/source/libxml2/generated/version/windows/x86_64/libxml/xmlversion.h index 5bcd8dd40fa..1124bc22cad 100644 --- a/libraries/cmake/source/libxml2/generated/version/windows/x86_64/libxml/xmlversion.h +++ b/libraries/cmake/source/libxml2/generated/version/windows/x86_64/libxml/xmlversion.h @@ -29,21 +29,21 @@ XMLPUBFUN void xmlCheckVersion(int version); * * the version string like "1.2.3" */ -#define LIBXML_DOTTED_VERSION "2.11.2" +#define LIBXML_DOTTED_VERSION "2.12.3" /** * LIBXML_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXML_VERSION 21102 +#define LIBXML_VERSION 21203 /** * LIBXML_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXML_VERSION_STRING "21102" +#define LIBXML_VERSION_STRING "21203" /** * LIBXML_VERSION_EXTRA: @@ -58,7 +58,7 @@ XMLPUBFUN void xmlCheckVersion(int version); * Macro to check that the libxml version in use is compatible with * the version the software has been compiled against */ -#define LIBXML_TEST_VERSION xmlCheckVersion(21102); +#define LIBXML_TEST_VERSION xmlCheckVersion(21203); #ifndef VMS #if 0 @@ -451,42 +451,26 @@ XMLPUBFUN void xmlCheckVersion(int version); #endif #if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 406) +#if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 800) #define XML_IGNORE_FPTR_CAST_WARNINGS \ _Pragma("GCC diagnostic push") \ _Pragma("GCC diagnostic ignored \"-Wpedantic\"") \ _Pragma("GCC diagnostic ignored \"-Wcast-function-type\"") +#else +#define XML_IGNORE_FPTR_CAST_WARNINGS \ + _Pragma("GCC diagnostic push") \ + _Pragma("GCC diagnostic ignored \"-Wpedantic\"") +#endif #define XML_POP_WARNINGS _Pragma("GCC diagnostic pop") #else #define XML_IGNORE_FPTR_CAST_WARNINGS #define XML_POP_WARNINGS #endif -/** DOC_ENABLE */ #else /* ! __GNUC__ */ -/** - * ATTRIBUTE_UNUSED: - * - * Macro used to signal to GCC unused function parameters - */ #define ATTRIBUTE_UNUSED -/** - * LIBXML_ATTR_ALLOC_SIZE: - * - * Macro used to indicate to GCC this is an allocator function - */ #define LIBXML_ATTR_ALLOC_SIZE(x) -/** - * LIBXML_ATTR_FORMAT: - * - * Macro used to indicate to GCC the parameter are printf like - */ #define LIBXML_ATTR_FORMAT(fmt, args) -/** - * XML_DEPRECATED: - * - * Macro used to indicate that a function, variable, type or struct member - * is deprecated. - */ #ifndef XML_DEPRECATED #if defined(IN_LIBXML) || !defined(_MSC_VER) #define XML_DEPRECATED @@ -495,21 +479,11 @@ XMLPUBFUN void xmlCheckVersion(int version); #define XML_DEPRECATED __declspec(deprecated) #endif #endif -/** - * LIBXML_IGNORE_FPTR_CAST_WARNINGS: - * - * Macro used to ignore pointer cast warnings that can't be worked around. - */ #if defined(_MSC_VER) && (_MSC_VER >= 1400) #define XML_IGNORE_FPTR_CAST_WARNINGS __pragma(warning(push)) #else #define XML_IGNORE_FPTR_CAST_WARNINGS #endif -/** - * XML_POP_WARNINGS: - * - * Macro used to restore warnings state. - */ #ifndef XML_POP_WARNINGS #if defined(_MSC_VER) && (_MSC_VER >= 1400) #define XML_POP_WARNINGS __pragma(warning(pop)) @@ -519,6 +493,16 @@ XMLPUBFUN void xmlCheckVersion(int version); #endif #endif /* __GNUC__ */ +#define XML_NO_ATTR + +#ifdef LIBXML_THREAD_ENABLED +#define XML_DECLARE_GLOBAL(name, type, attrs) \ + attrs XMLPUBFUN type* __##name(void); +#define XML_GLOBAL_MACRO(name) (*__##name()) +#else +#define XML_DECLARE_GLOBAL(name, type, attrs) attrs XMLPUBVAR type name; +#endif + #ifdef __cplusplus } #endif /* __cplusplus */ diff --git a/libraries/cmake/source/libxml2/src b/libraries/cmake/source/libxml2/src index 838bf42d54f..30d22bec038 160000 --- a/libraries/cmake/source/libxml2/src +++ b/libraries/cmake/source/libxml2/src @@ -1 +1 @@ -Subproject commit 838bf42d54f94c8ff99b6e5022899a32875ed5d7 +Subproject commit 30d22bec03893ad646907050959bdfe9e8000146 diff --git a/libraries/third_party_libraries_manifest.json b/libraries/third_party_libraries_manifest.json index ca683795811..1add39d87ff 100644 --- a/libraries/third_party_libraries_manifest.json +++ b/libraries/third_party_libraries_manifest.json @@ -233,8 +233,8 @@ "libxml2": { "product": "libxml2", "vendor": "xmlsoft", - "version": "2.11.2", - "commit": "838bf42d54f94c8ff99b6e5022899a32875ed5d7", + "version": "2.12.3", + "commit": "30d22bec03893ad646907050959bdfe9e8000146", "ignored-cves": [] }, "linenoise-ng": {