Skip to content

Commit 073a491

Browse files
SibrasSibras
committed
project: Update for 2.11.0 merge.
1 parent a97f94d commit 073a491

File tree

11 files changed

+206
-208
lines changed

11 files changed

+206
-208
lines changed

‎.gitlab-ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ gcc:minimum:
2323
gcc:python3:
2424
extends: .test
2525
variables:
26-
# TODO: Re-enable the warning after #208 is fixed.
27-
CFLAGS: "-O2 -Wno-error=deprecated-declarations"
26+
CFLAGS: "-O2"
2827
PYTHON: "/usr/bin/python3"
2928

3029
gcc:static:

‎Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ EXTRA_DIST = Copyright check-xml-test-suite.py gentest.py \
420420

421421

422422
pkgconfigdir = $(libdir)/pkgconfig
423-
nodist_pkgconfig_DATA = libxml-2.0.pc
423+
pkgconfig_DATA = libxml-2.0.pc
424424

425425
cmakedir = $(libdir)/cmake/libxml2
426426
cmake_DATA = libxml2-config.cmake

‎SMP/SMP.patch

Lines changed: 11 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/catalog.c b/catalog.c
2-
index b7837e3d..d0fa3486 100644
2+
index 24a49f3d..0eaaf7ba 100644
33
--- a/catalog.c
44
+++ b/catalog.c
55
@@ -75,6 +75,10 @@
@@ -13,7 +13,7 @@ index b7837e3d..d0fa3486 100644
1313
#undef XML_XML_DEFAULT_CATALOG
1414
static char XML_XML_DEFAULT_CATALOG[256] = "file://" SYSCONFDIR "/xml/catalog";
1515
#if !defined(_WINDOWS_)
16-
@@ -3117,12 +3121,17 @@ xmlInitializeCatalog(void) {
16+
@@ -3113,12 +3117,17 @@ xmlInitializeCatalog(void) {
1717

1818
catalogs = (const char *) getenv("XML_CATALOG_FILES");
1919
if (catalogs == NULL)
@@ -34,23 +34,11 @@ index b7837e3d..d0fa3486 100644
3434
if (hmodule != NULL) {
3535
char buf[256];
3636
unsigned long len = GetModuleFileNameA(hmodule, buf, 255);
37-
diff --git a/libxml.h b/libxml.h
38-
index 66f164d5..ff95641c 100644
39-
--- a/libxml.h
40-
+++ b/libxml.h
41-
@@ -34,6 +34,7 @@
42-
#ifndef SYSCONFDIR
43-
#define SYSCONFDIR "/etc"
44-
#endif
45-
+#include <libxml/xmlstring.h>
46-
47-
#if defined(__Lynx__)
48-
#include <stdio.h> /* pull definition of size_t */
4937
diff --git a/nanohttp.c b/nanohttp.c
50-
index 2eafd3f4..44be166f 100644
38+
index e014fe48..4e7b7c7f 100644
5139
--- a/nanohttp.c
5240
+++ b/nanohttp.c
53-
@@ -70,6 +70,13 @@
41+
@@ -64,6 +64,13 @@
5442
#include <wsockcompat.h>
5543
#endif
5644

@@ -64,105 +52,11 @@ index 2eafd3f4..44be166f 100644
6452
#include <libxml/globals.h>
6553
#include <libxml/xmlerror.h>
6654
#include <libxml/xmlmemory.h>
67-
diff --git a/win32/libxml2.def.src b/win32/libxml2.def.src
68-
index d83dbf4a..3ed86578 100644
69-
--- a/win32/libxml2.def.src
70-
+++ b/win32/libxml2.def.src
71-
@@ -5,7 +5,7 @@ EXPORTS
72-
#ifdef LIBXML_REGEXP_ENABLED
73-
emptyExp DATA
74-
#endif
75-
-#ifdef LIBXML_REGEXP_ENABLED
76-
+#ifdef LIBXML_EXPR_ENABLED
77-
forbiddenExp DATA
78-
#endif
79-
#ifdef LIBXML_THREAD_ENABLED
80-
@@ -758,61 +758,61 @@ xmlEncodeEntities
81-
xmlEncodeEntitiesReentrant
82-
xmlEncodeSpecialChars
83-
xmlErrMemory
84-
-#ifdef LIBXML_REGEXP_ENABLED
85-
+#ifdef LIBXML_EXPR_ENABLED
86-
xmlExpCtxtNbCons
87-
#endif
88-
-#ifdef LIBXML_REGEXP_ENABLED
89-
+#ifdef LIBXML_EXPR_ENABLED
90-
xmlExpCtxtNbNodes
91-
#endif
92-
-#ifdef LIBXML_REGEXP_ENABLED
93-
+#ifdef LIBXML_EXPR_ENABLED
94-
xmlExpDump
95-
#endif
96-
-#ifdef LIBXML_REGEXP_ENABLED
97-
+#ifdef LIBXML_EXPR_ENABLED
98-
xmlExpExpDerive
99-
#endif
100-
-#ifdef LIBXML_REGEXP_ENABLED
101-
+#ifdef LIBXML_EXPR_ENABLED
102-
xmlExpFree
103-
#endif
104-
-#ifdef LIBXML_REGEXP_ENABLED
105-
+#ifdef LIBXML_EXPR_ENABLED
106-
xmlExpFreeCtxt
107-
#endif
108-
-#ifdef LIBXML_REGEXP_ENABLED
109-
+#ifdef LIBXML_EXPR_ENABLED
110-
xmlExpGetLanguage
111-
#endif
112-
-#ifdef LIBXML_REGEXP_ENABLED
113-
+#ifdef LIBXML_EXPR_ENABLED
114-
xmlExpGetStart
115-
#endif
116-
-#ifdef LIBXML_REGEXP_ENABLED
117-
+#ifdef LIBXML_EXPR_ENABLED
118-
xmlExpIsNillable
119-
#endif
120-
-#ifdef LIBXML_REGEXP_ENABLED
121-
+#ifdef LIBXML_EXPR_ENABLED
122-
xmlExpMaxToken
123-
#endif
124-
-#ifdef LIBXML_REGEXP_ENABLED
125-
+#ifdef LIBXML_EXPR_ENABLED
126-
xmlExpNewAtom
127-
#endif
128-
-#ifdef LIBXML_REGEXP_ENABLED
129-
+#ifdef LIBXML_EXPR_ENABLED
130-
xmlExpNewCtxt
131-
#endif
132-
-#ifdef LIBXML_REGEXP_ENABLED
133-
+#ifdef LIBXML_EXPR_ENABLED
134-
xmlExpNewOr
135-
#endif
136-
-#ifdef LIBXML_REGEXP_ENABLED
137-
+#ifdef LIBXML_EXPR_ENABLED
138-
xmlExpNewRange
139-
#endif
140-
-#ifdef LIBXML_REGEXP_ENABLED
141-
+#ifdef LIBXML_EXPR_ENABLED
142-
xmlExpNewSeq
143-
#endif
144-
-#ifdef LIBXML_REGEXP_ENABLED
145-
+#ifdef LIBXML_EXPR_ENABLED
146-
xmlExpParse
147-
#endif
148-
-#ifdef LIBXML_REGEXP_ENABLED
149-
+#ifdef LIBXML_EXPR_ENABLED
150-
xmlExpRef
151-
#endif
152-
-#ifdef LIBXML_REGEXP_ENABLED
153-
+#ifdef LIBXML_EXPR_ENABLED
154-
xmlExpStringDerive
155-
#endif
156-
-#ifdef LIBXML_REGEXP_ENABLED
157-
+#ifdef LIBXML_EXPR_ENABLED
158-
xmlExpSubsume
159-
#endif
160-
xmlFileClose
16155
diff --git a/xmlIO.c b/xmlIO.c
162-
index 5482cb34..532a492c 100644
56+
index 5cab16f4..230e4abb 100644
16357
--- a/xmlIO.c
16458
+++ b/xmlIO.c
165-
@@ -41,6 +41,13 @@
59+
@@ -38,6 +38,13 @@
16660
#include <direct.h>
16761
#endif
16862

@@ -176,7 +70,7 @@ index 5482cb34..532a492c 100644
17670
#ifndef S_ISDIR
17771
# ifdef _S_ISDIR
17872
# define S_ISDIR(x) _S_ISDIR(x)
179-
@@ -3768,11 +3775,13 @@ xmlParserGetDirectory(const char *filename) {
73+
@@ -3717,11 +3724,13 @@ xmlParserGetDirectory(const char *filename) {
18074
if (cur == dir) dir[1] = 0;
18175
else *cur = 0;
18276
ret = xmlMemStrdup(dir);
@@ -191,10 +85,10 @@ index 5482cb34..532a492c 100644
19185
return(ret);
19286
#undef IS_XMLPGD_SEP
19387
diff --git a/xmlmemory.c b/xmlmemory.c
194-
index 892d50c3..b02c9ad5 100644
88+
index 9ec4770b..2d8bc376 100644
19589
--- a/xmlmemory.c
19690
+++ b/xmlmemory.c
197-
@@ -39,6 +39,13 @@ static xmlMutexPtr xmlMemMutex = NULL;
91+
@@ -41,6 +41,13 @@ static xmlMutex xmlMemMutex;
19892

19993
void xmlMallocBreakpoint(void);
20094

@@ -209,10 +103,10 @@ index 892d50c3..b02c9ad5 100644
209103
* *
210104
* Macros, variables and associated types *
211105
diff --git a/xmlmodule.c b/xmlmodule.c
212-
index 44eba066..cfc8c900 100644
106+
index cbb25a6d..5b2ae01b 100644
213107
--- a/xmlmodule.c
214108
+++ b/xmlmodule.c
215-
@@ -314,7 +314,15 @@ xmlModulePlatformSymbol(void *handle, const char *name, void **symbol)
109+
@@ -316,7 +316,15 @@ xmlModulePlatformSymbol(void *handle, const char *name, void **symbol)
216110
static void *
217111
xmlModulePlatformOpen(const char *name)
218112
{

‎SMP/config.h

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
#ifndef __LIBXML_WIN32_CONFIG__
22
#define __LIBXML_WIN32_CONFIG__
33

4-
#define SEND_ARG2_CAST
5-
#define GETHOSTBYNAME_ARG_CAST
6-
74
#define HAVE_SYS_STAT_H
85
#define HAVE_STAT
96
#define HAVE_FCNTL_H
107

118
#if defined(__MINGW32__) || (defined(_MSC_VER) && _MSC_VER >= 1600)
12-
#define HAVE_STDINT_H
9+
#define HAVE_STDINT_H
1310
#endif
1411

1512
#if defined(_MSC_VER)
16-
#if _MSC_VER < 1900
17-
#define snprintf _snprintf
18-
#endif
19-
#if _MSC_VER < 1500
20-
#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
21-
#endif
13+
#if _MSC_VER < 1900
14+
#define snprintf _snprintf
15+
#endif
16+
#if _MSC_VER < 1500
17+
#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a)
18+
#endif
2219
#endif
2320

2421
#endif /* __LIBXML_WIN32_CONFIG__ */

0 commit comments

Comments
 (0)