From: Alberto Leiva Popper <ydahhrk@gmail.com>
Date: Mon, 3 Jun 2024 22:48:15 +0000 (-0600)
Subject: Fix relax_ng_log_str_err() signature for old libxml2 versions
X-Git-Tag: 1.6.3~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cdf9248f87a93f710f3df710bebe13a159483798;p=thirdparty%2FFORT-validator.git

Fix relax_ng_log_str_err() signature for old libxml2 versions

Pull request #137 fixes relax_ng_log_str_err()'s argument list for
libxml2 2.12 and above, but breaks it for libxml2 2.11 and below.
---

diff --git a/src/xml/relax_ng.c b/src/xml/relax_ng.c
index d386078a..21f28314 100644
--- a/src/xml/relax_ng.c
+++ b/src/xml/relax_ng.c
@@ -35,8 +35,15 @@ 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, const xmlError *error)
+relax_ng_log_str_err(void *userData, XMLERROR_PARAMTYPE error)
 {
 	pr_val_err("%s (at line %d)", error->message, error->line);
 }