Skip to content

Commit

Permalink
www/{*chromium,iridium}: xmlError is only a const since version 2.12
Browse files Browse the repository at this point in the history
the previous patches were checking if libxml is older than 2.11.6,
but that breaks builds with 2.11.7 as xmlError has been changed to
a const at 2.12

PR:		276901, 276902, 276903
Reported by:	diizzy@

(cherry picked from commit 1e1b3d4)
  • Loading branch information
Robert Nagy authored and Robert Nagy committed Feb 9, 2024
1 parent 7a27765 commit 2920933
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
Expand Up @@ -4,7 +4,7 @@

void reset();

+#if (LIBXML_VERSION > 21106)
+#if (LIBXML_VERSION >= 21200)
static void ParseErrorFunc(void* user_data, const xmlError*);
+#else
+ static void ParseErrorFunc(void* user_data, xmlError*);
Expand Down
Expand Up @@ -4,7 +4,7 @@
// It would be nice to do something with this error message.
}

+#if (LIBXML_VERSION > 21106)
+#if (LIBXML_VERSION >= 21200)
void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
+#else
+void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
Expand Down
Expand Up @@ -4,7 +4,7 @@

void reset();

+#if (LIBXML_VERSION > 21106)
+#if (LIBXML_VERSION >= 21200)
+ static void ParseErrorFunc(void* user_data, const xmlError*);
+#else
static void ParseErrorFunc(void* user_data, xmlError*);
Expand Down
Expand Up @@ -4,7 +4,7 @@
// It would be nice to do something with this error message.
}

+#if (LIBXML_VERSION > 21106)
+#if (LIBXML_VERSION >= 21200)
+void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
+#else
void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
Expand Down
Expand Up @@ -4,7 +4,7 @@

void reset();

+#if (LIBXML_VERSION > 21106)
+#if (LIBXML_VERSION >= 21200)
static void ParseErrorFunc(void* user_data, const xmlError*);
+#else
+ static void ParseErrorFunc(void* user_data, xmlError*);
Expand Down
Expand Up @@ -4,7 +4,7 @@
// It would be nice to do something with this error message.
}

+#if (LIBXML_VERSION > 21106)
+#if (LIBXML_VERSION >= 21200)
void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
+#else
+void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
Expand Down

0 comments on commit 2920933

Please sign in to comment.