Skip to content

Commit b51195f

Browse files
committed
Update libxml2 to version 2.13.5.
1 parent fef5a4e commit b51195f

File tree

11 files changed

+185
-207
lines changed

11 files changed

+185
-207
lines changed

ChangeLog

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dd.mm.yy hh:mm - smooth alpha 0.9.11
88

99
- upgraded fribidi to version 1.0.16
1010
- upgraded libcpuid to version 0.6.4
11-
- upgraded libxml2 to version 2.13.3
11+
- upgraded libxml2 to version 2.13.5
1212
- upgraded libcurl to version 8.9.1
1313
- upgraded libpng to version 1.6.44
1414
- upgraded libwebp to version 1.4.0

include/support/libxml2/libxml/xmlexports.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
#define XML_DEPRECATED
6868
#elif __GNUC__ * 100 + __GNUC_MINOR__ >= 301
6969
#define XML_DEPRECATED __attribute__((deprecated))
70-
#elif _MSC_VER >= 1400
70+
#elif defined(_MSC_VER) && _MSC_VER >= 1400
7171
/* Available since Visual Studio 2005 */
7272
#define XML_DEPRECATED __declspec(deprecated)
7373
#else
@@ -100,7 +100,7 @@
100100
#define XML_POP_WARNINGS \
101101
_Pragma("GCC diagnostic pop")
102102

103-
#elif _MSC_VER >= 1400
103+
#elif defined(_MSC_VER) && _MSC_VER >= 1400
104104

105105
#define XML_IGNORE_FPTR_CAST_WARNINGS __pragma(warning(push))
106106
#define XML_POP_WARNINGS __pragma(warning(pop))

include/support/libxml2/libxml/xmlversion.h

Lines changed: 7 additions & 171 deletions
Original file line numberDiff line numberDiff line change
@@ -10,80 +10,41 @@
1010
#ifndef __XML_VERSION_H__
1111
#define __XML_VERSION_H__
1212

13-
#include <libxml/xmlexports.h>
14-
15-
#ifdef __cplusplus
16-
extern "C" {
17-
#endif
18-
19-
/*
20-
* use those to be sure nothing nasty will happen if
21-
* your library and includes mismatch
22-
*/
23-
#ifndef LIBXML2_COMPILING_MSCCDEF
24-
XMLPUBFUN void xmlCheckVersion(int version);
25-
#endif /* LIBXML2_COMPILING_MSCCDEF */
26-
2713
/**
2814
* LIBXML_DOTTED_VERSION:
2915
*
3016
* the version string like "1.2.3"
3117
*/
32-
#define LIBXML_DOTTED_VERSION "2.12.5"
18+
#define LIBXML_DOTTED_VERSION "2.13.5"
3319

3420
/**
3521
* LIBXML_VERSION:
3622
*
3723
* the version number: 1.2.3 value is 10203
3824
*/
39-
#define LIBXML_VERSION 21205
25+
#define LIBXML_VERSION 21305
4026

4127
/**
4228
* LIBXML_VERSION_STRING:
4329
*
4430
* the version number string, 1.2.3 value is "10203"
4531
*/
46-
#define LIBXML_VERSION_STRING "21205"
32+
#define LIBXML_VERSION_STRING "21305"
4733

4834
/**
4935
* LIBXML_VERSION_EXTRA:
5036
*
5137
* extra version information, used to show a git commit description
5238
*/
53-
#define LIBXML_VERSION_EXTRA "-GITv2.12.5"
39+
#define LIBXML_VERSION_EXTRA "-GITv2.13.5"
5440

5541
/**
5642
* LIBXML_TEST_VERSION:
5743
*
5844
* Macro to check that the libxml version in use is compatible with
5945
* the version the software has been compiled against
6046
*/
61-
#define LIBXML_TEST_VERSION xmlCheckVersion(21205);
62-
63-
#ifndef VMS
64-
#if 0
65-
/**
66-
* WITH_TRIO:
67-
*
68-
* defined if the trio support need to be configured in
69-
*/
70-
#define WITH_TRIO
71-
#else
72-
/**
73-
* WITHOUT_TRIO:
74-
*
75-
* defined if the trio support should not be configured in
76-
*/
77-
#define WITHOUT_TRIO
78-
#endif
79-
#else /* VMS */
80-
/**
81-
* WITH_TRIO:
82-
*
83-
* defined if the trio support need to be configured in
84-
*/
85-
#define WITH_TRIO 1
86-
#endif /* VMS */
47+
#define LIBXML_TEST_VERSION xmlCheckVersion(21305);
8748

8849
/**
8950
* LIBXML_THREAD_ENABLED:
@@ -301,24 +262,6 @@ XMLPUBFUN void xmlCheckVersion(int version);
301262
#define LIBXML_DEBUG_ENABLED
302263
#endif
303264

304-
/**
305-
* DEBUG_MEMORY_LOCATION:
306-
*
307-
* Whether the memory debugging is configured in
308-
*/
309-
#if 0
310-
#define DEBUG_MEMORY_LOCATION
311-
#endif
312-
313-
/**
314-
* LIBXML_DEBUG_RUNTIME:
315-
*
316-
* Removed
317-
*/
318-
#if 0
319-
#define LIBXML_DEBUG_RUNTIME
320-
#endif
321-
322265
/**
323266
* LIBXML_UNICODE_ENABLED:
324267
*
@@ -346,17 +289,6 @@ XMLPUBFUN void xmlCheckVersion(int version);
346289
#define LIBXML_AUTOMATA_ENABLED
347290
#endif
348291

349-
/**
350-
* LIBXML_EXPR_ENABLED:
351-
*
352-
* Whether the formal expressions interfaces are compiled in
353-
*
354-
* This code is unused and disabled unconditionally for now.
355-
*/
356-
#if 0
357-
#define LIBXML_EXPR_ENABLED
358-
#endif
359-
360292
/**
361293
* LIBXML_SCHEMAS_ENABLED:
362294
*
@@ -408,104 +340,8 @@ XMLPUBFUN void xmlCheckVersion(int version);
408340
#define LIBXML_LZMA_ENABLED
409341
#endif
410342

411-
#ifdef __GNUC__
412-
/** DOC_DISABLE */
413-
414-
#ifndef ATTRIBUTE_UNUSED
415-
# if ((__GNUC__ > 2) || ((__GNUC__ == 2) && (__GNUC_MINOR__ >= 7)))
416-
# define ATTRIBUTE_UNUSED __attribute__((unused))
417-
# else
418-
# define ATTRIBUTE_UNUSED
419-
# endif
420-
#endif
421-
422-
#ifndef LIBXML_ATTR_ALLOC_SIZE
423-
# if (!defined(__clang__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))))
424-
# define LIBXML_ATTR_ALLOC_SIZE(x) __attribute__((alloc_size(x)))
425-
# else
426-
# define LIBXML_ATTR_ALLOC_SIZE(x)
427-
# endif
428-
#else
429-
# define LIBXML_ATTR_ALLOC_SIZE(x)
430-
#endif
431-
432-
#ifndef LIBXML_ATTR_FORMAT
433-
# if ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
434-
# define LIBXML_ATTR_FORMAT(fmt,args) __attribute__((__format__(__printf__,fmt,args)))
435-
# else
436-
# define LIBXML_ATTR_FORMAT(fmt,args)
437-
# endif
438-
#else
439-
# define LIBXML_ATTR_FORMAT(fmt,args)
440-
#endif
441-
442-
#ifndef XML_DEPRECATED
443-
# if defined (IN_LIBXML) || (__GNUC__ * 100 + __GNUC_MINOR__ < 301)
444-
# define XML_DEPRECATED
445-
/* Available since at least GCC 3.1 */
446-
# else
447-
# define XML_DEPRECATED __attribute__((deprecated))
448-
# endif
449-
#endif
450-
451-
#if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
452-
#if defined(__clang__) || (__GNUC__ * 100 + __GNUC_MINOR__ >= 800)
453-
#define XML_IGNORE_FPTR_CAST_WARNINGS \
454-
_Pragma("GCC diagnostic push") \
455-
_Pragma("GCC diagnostic ignored \"-Wpedantic\"") \
456-
_Pragma("GCC diagnostic ignored \"-Wcast-function-type\"")
457-
#else
458-
#define XML_IGNORE_FPTR_CAST_WARNINGS \
459-
_Pragma("GCC diagnostic push") \
460-
_Pragma("GCC diagnostic ignored \"-Wpedantic\"")
461-
#endif
462-
#define XML_POP_WARNINGS \
463-
_Pragma("GCC diagnostic pop")
464-
#else
465-
#define XML_IGNORE_FPTR_CAST_WARNINGS
466-
#define XML_POP_WARNINGS
467-
#endif
468-
469-
#else /* ! __GNUC__ */
470-
#define ATTRIBUTE_UNUSED
471-
#define LIBXML_ATTR_ALLOC_SIZE(x)
472-
#define LIBXML_ATTR_FORMAT(fmt,args)
473-
#ifndef XML_DEPRECATED
474-
# if defined (IN_LIBXML) || !defined (_MSC_VER)
475-
# define XML_DEPRECATED
476-
/* Available since Visual Studio 2005 */
477-
# elif defined (_MSC_VER) && (_MSC_VER >= 1400)
478-
# define XML_DEPRECATED __declspec(deprecated)
479-
# endif
480-
#endif
481-
#if defined (_MSC_VER) && (_MSC_VER >= 1400)
482-
# define XML_IGNORE_FPTR_CAST_WARNINGS __pragma(warning(push))
483-
#else
484-
# define XML_IGNORE_FPTR_CAST_WARNINGS
485-
#endif
486-
#ifndef XML_POP_WARNINGS
487-
# if defined (_MSC_VER) && (_MSC_VER >= 1400)
488-
# define XML_POP_WARNINGS __pragma(warning(pop))
489-
# else
490-
# define XML_POP_WARNINGS
491-
# endif
492-
#endif
493-
#endif /* __GNUC__ */
494-
495-
#define XML_NO_ATTR
496-
497-
#ifdef LIBXML_THREAD_ENABLED
498-
#define XML_DECLARE_GLOBAL(name, type, attrs) \
499-
attrs XMLPUBFUN type *__##name(void);
500-
#define XML_GLOBAL_MACRO(name) (*__##name())
501-
#else
502-
#define XML_DECLARE_GLOBAL(name, type, attrs) \
503-
attrs XMLPUBVAR type name;
504-
#endif
505-
506-
#ifdef __cplusplus
507-
}
508-
#endif /* __cplusplus */
343+
#include <libxml/xmlexports.h>
344+
509345
#endif
510346

511347

0 commit comments

Comments
 (0)