project: Update for 2.12.4 merge.

ShiftMediaProject · Apr 6, 2024 · 396b5f0 · 396b5f0
1 parent eae7fce
commit 396b5f0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/SMP/SMP.patch b/SMP/SMP.patch
@@ -35,10 +35,10 @@ index 945ea2c8..73902f29 100644
  			char buf[256];
  			unsigned long len = GetModuleFileNameA(hmodule, buf, 255);
 diff --git a/parser.c b/parser.c
-index dd5dd1fc..e3587dc5 100644
+index aeaadcdd..0897af83 100644
 --- a/parser.c
 +++ b/parser.c
-@@ -9888,7 +9888,7 @@ next_attr:
+@@ -9887,7 +9887,7 @@ next_attr:
  	if (defaults != NULL) {
  	    for (i = 0; i < defaults->nbAttrs; i++) {
                  xmlDefAttr *attr = &defaults->attrs[i];
@@ -48,7 +48,7 @@ index dd5dd1fc..e3587dc5 100644
                  int res;
 
 diff --git a/xmlIO.c b/xmlIO.c
-index 90379e2d..e11bcf3a 100644
+index 95d27157..8844f483 100644
 --- a/xmlIO.c
 +++ b/xmlIO.c
 @@ -38,6 +38,13 @@
@@ -65,7 +65,7 @@ index 90379e2d..e11bcf3a 100644
  #ifndef S_ISDIR
  #  ifdef _S_ISDIR
  #    define S_ISDIR(x) _S_ISDIR(x)
-@@ -3687,11 +3694,13 @@ xmlParserGetDirectory(const char *filename) {
+@@ -3729,11 +3736,13 @@ xmlParserGetDirectory(const char *filename) {
          if (cur == dir) dir[1] = 0;
  	else *cur = 0;
  	ret = xmlMemStrdup(dir);

diff --git a/SMP/libxml/xmlversion.h b/SMP/libxml/xmlversion.h
@@ -29,36 +29,36 @@ XMLPUBFUN void xmlCheckVersion(int version);
  *
  * the version string like "1.2.3"
  */
-#define LIBXML_DOTTED_VERSION "2.12.3"
+#define LIBXML_DOTTED_VERSION "2.12.4"
 
 /**
  * LIBXML_VERSION:
  *
  * the version number: 1.2.3 value is 10203
  */
-#define LIBXML_VERSION 20123
+#define LIBXML_VERSION 20124
 
 /**
  * LIBXML_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "10203"
  */
-#define LIBXML_VERSION_STRING "20123"
+#define LIBXML_VERSION_STRING "20124"
 
 /**
  * LIBXML_VERSION_EXTRA:
  *
  * extra version information, used to show a git commit description
  */
-#define LIBXML_VERSION_EXTRA "-GITv2.12.3"
+#define LIBXML_VERSION_EXTRA "-GITv2.12.4"
 
 /**
  * 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(20123);
+#define LIBXML_TEST_VERSION xmlCheckVersion(20124);
 
 #ifndef VMS
 #if 0

diff --git a/SMP/rcVersion.h b/SMP/rcVersion.h
@@ -5,5 +5,5 @@
 
 #define LIBXML_MAJOR_VERSION 2
 #define LIBXML_MINOR_VERSION 12
-#define LIBXML_MICRO_VERSION 3
-#define LIBXML_DOTTED_VERSION "2.12.3"
+#define LIBXML_MICRO_VERSION 4
+#define LIBXML_DOTTED_VERSION "2.12.4"