|
10 | 10 | #ifndef __XML_VERSION_H__
|
11 | 11 | #define __XML_VERSION_H__
|
12 | 12 |
|
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 |
| - |
27 | 13 | /**
|
28 | 14 | * LIBXML_DOTTED_VERSION:
|
29 | 15 | *
|
30 | 16 | * the version string like "1.2.3"
|
31 | 17 | */
|
32 |
| -#define LIBXML_DOTTED_VERSION "2.12.5" |
| 18 | +#define LIBXML_DOTTED_VERSION "2.13.5" |
33 | 19 |
|
34 | 20 | /**
|
35 | 21 | * LIBXML_VERSION:
|
36 | 22 | *
|
37 | 23 | * the version number: 1.2.3 value is 10203
|
38 | 24 | */
|
39 |
| -#define LIBXML_VERSION 21205 |
| 25 | +#define LIBXML_VERSION 21305 |
40 | 26 |
|
41 | 27 | /**
|
42 | 28 | * LIBXML_VERSION_STRING:
|
43 | 29 | *
|
44 | 30 | * the version number string, 1.2.3 value is "10203"
|
45 | 31 | */
|
46 |
| -#define LIBXML_VERSION_STRING "21205" |
| 32 | +#define LIBXML_VERSION_STRING "21305" |
47 | 33 |
|
48 | 34 | /**
|
49 | 35 | * LIBXML_VERSION_EXTRA:
|
50 | 36 | *
|
51 | 37 | * extra version information, used to show a git commit description
|
52 | 38 | */
|
53 |
| -#define LIBXML_VERSION_EXTRA "-GITv2.12.5" |
| 39 | +#define LIBXML_VERSION_EXTRA "-GITv2.13.5" |
54 | 40 |
|
55 | 41 | /**
|
56 | 42 | * LIBXML_TEST_VERSION:
|
57 | 43 | *
|
58 | 44 | * Macro to check that the libxml version in use is compatible with
|
59 | 45 | * the version the software has been compiled against
|
60 | 46 | */
|
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); |
87 | 48 |
|
88 | 49 | /**
|
89 | 50 | * LIBXML_THREAD_ENABLED:
|
@@ -301,24 +262,6 @@ XMLPUBFUN void xmlCheckVersion(int version);
|
301 | 262 | #define LIBXML_DEBUG_ENABLED
|
302 | 263 | #endif
|
303 | 264 |
|
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 |
| - |
322 | 265 | /**
|
323 | 266 | * LIBXML_UNICODE_ENABLED:
|
324 | 267 | *
|
@@ -346,17 +289,6 @@ XMLPUBFUN void xmlCheckVersion(int version);
|
346 | 289 | #define LIBXML_AUTOMATA_ENABLED
|
347 | 290 | #endif
|
348 | 291 |
|
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 |
| - |
360 | 292 | /**
|
361 | 293 | * LIBXML_SCHEMAS_ENABLED:
|
362 | 294 | *
|
@@ -408,104 +340,8 @@ XMLPUBFUN void xmlCheckVersion(int version);
|
408 | 340 | #define LIBXML_LZMA_ENABLED
|
409 | 341 | #endif
|
410 | 342 |
|
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 | + |
509 | 345 | #endif
|
510 | 346 |
|
511 | 347 |
|
0 commit comments