Skip to content

Commit f2f90ca

Browse files
committed
project: Update for 2.13.3 merge.
1 parent 5425df8 commit f2f90ca

File tree

3 files changed

+10
-28
lines changed

3 files changed

+10
-28
lines changed

SMP/SMP.patch

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/parser.c b/parser.c
2-
index 1a0ff156..ee20a380 100644
2+
index 10695ecf..70b2bf74 100644
33
--- a/parser.c
44
+++ b/parser.c
5-
@@ -7604,7 +7604,7 @@ xmlHandleUndeclaredEntity(xmlParserCtxtPtr ctxt, const xmlChar *name) {
5+
@@ -7612,7 +7612,7 @@ xmlHandleUndeclaredEntity(xmlParserCtxtPtr ctxt, const xmlChar *name) {
66

77
static xmlEntityPtr
88
xmlLookupGeneralEntity(xmlParserCtxtPtr ctxt, const xmlChar *name, int inAttr) {
@@ -11,7 +11,7 @@ index 1a0ff156..ee20a380 100644
1111

1212
/*
1313
* Predefined entities override any extra definition
14-
@@ -9349,7 +9349,7 @@ next_attr:
14+
@@ -9357,7 +9357,7 @@ next_attr:
1515
if (defaults != NULL) {
1616
for (i = 0; i < defaults->nbAttrs; i++) {
1717
xmlDefAttr *attr = &defaults->attrs[i];
@@ -20,24 +20,6 @@ index 1a0ff156..ee20a380 100644
2020
unsigned hashValue, uriHashValue;
2121
int res;
2222

23-
diff --git a/xmlIO.c b/xmlIO.c
24-
index 640d909c..02506207 100644
25-
--- a/xmlIO.c
26-
+++ b/xmlIO.c
27-
@@ -2903,11 +2903,13 @@ xmlParserGetDirectory(const char *filename) {
28-
if (cur == dir) dir[1] = 0;
29-
else *cur = 0;
30-
ret = xmlMemStrdup(dir);
31-
+#if !defined(WINAPI_FAMILY_PARTITION) || !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) || WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
32-
} else {
33-
if (getcwd(dir, 1024) != NULL) {
34-
dir[1023] = 0;
35-
ret = xmlMemStrdup(dir);
36-
}
37-
+#endif
38-
}
39-
return(ret);
40-
#undef IS_XMLPGD_SEP
4123
diff --git a/xmlmodule.c b/xmlmodule.c
4224
index dd2fd7a5..a80bac1f 100644
4325
--- a/xmlmodule.c

SMP/libxml/xmlversion.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,36 @@
1515
*
1616
* the version string like "1.2.3"
1717
*/
18-
#define LIBXML_DOTTED_VERSION "2.13.2"
18+
#define LIBXML_DOTTED_VERSION "2.13.3"
1919

2020
/**
2121
* LIBXML_VERSION:
2222
*
2323
* the version number: 1.2.3 value is 10203
2424
*/
25-
#define LIBXML_VERSION 20132
25+
#define LIBXML_VERSION 20133
2626

2727
/**
2828
* LIBXML_VERSION_STRING:
2929
*
3030
* the version number string, 1.2.3 value is "10203"
3131
*/
32-
#define LIBXML_VERSION_STRING "20132"
32+
#define LIBXML_VERSION_STRING "20133"
3333

3434
/**
3535
* LIBXML_VERSION_EXTRA:
3636
*
3737
* extra version information, used to show a git commit description
3838
*/
39-
#define LIBXML_VERSION_EXTRA "-GITv2.13.2"
39+
#define LIBXML_VERSION_EXTRA "-GITv2.13.3"
4040

4141
/**
4242
* LIBXML_TEST_VERSION:
4343
*
4444
* Macro to check that the libxml version in use is compatible with
4545
* the version the software has been compiled against
4646
*/
47-
#define LIBXML_TEST_VERSION xmlCheckVersion(20132);
47+
#define LIBXML_TEST_VERSION xmlCheckVersion(20133);
4848

4949
/**
5050
* LIBXML_THREAD_ENABLED:

SMP/rcVersion.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@
55

66
#define LIBXML_MAJOR_VERSION 2
77
#define LIBXML_MINOR_VERSION 13
8-
#define LIBXML_MICRO_VERSION 2
9-
#define LIBXML_DOTTED_VERSION "2.13.2"
8+
#define LIBXML_MICRO_VERSION 3
9+
#define LIBXML_DOTTED_VERSION "2.13.3"

0 commit comments

Comments
 (0)