blob: f050f418eae331564c5c8fb7e4bedbc634945cfe (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
Backport commits 58a94fc..cdf9248 that enable compatibility with
>=dev-libs/libxml2-2.12.0.
Author: Lucio Sauer <watermanpaint@posteo.net>
--- a/src/xml/relax_ng.c
+++ b/src/xml/relax_ng.c
@@ -35,15 +35,17 @@ relax_ng_log_warn(void *ctx, const char *msg, ...)
VLOG_MSG(warn)
}
+/* Signature changed at libxml2 commit 61034116d0a3c8b295c6137956adc3ae55720. */
+#if LIBXML_VERSION >= 21200
+#define XMLERROR_PARAMTYPE const xmlError *
+#else
+#define XMLERROR_PARAMTYPE xmlErrorPtr
+#endif
+
static void
-relax_ng_log_str_err(void *userData, xmlErrorPtr error)
+relax_ng_log_str_err(void *userData, XMLERROR_PARAMTYPE error)
{
- char *ptr;
-
- ptr = error->message;
- if (ptr[strlen(ptr) - 1] == '\n')
- ptr[strlen(ptr) - 1] = '\0';
- pr_val_err("%s (at line %d)", ptr, error->line);
+ pr_val_err("%s (at line %d)", error->message, error->line);
}
/* Initialize global schema to parse RRDP files */
|
