From: Bruno Haible <bruno@clisp.org>
Date: Sun, 1 Dec 2024 18:35:51 +0000 (+0100)
Subject: Fix compilation error with libxml2 >= 2.12.0 and gcc >= 14.
X-Git-Tag: v0.24~132
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=adfbe2ee7cd9b47a0465aa9a07d773fa290f46c1;p=thirdparty%2Fgettext.git

Fix compilation error with libxml2 >= 2.12.0 and gcc >= 14.

Reported by Sam James <sam@gentoo.org>
at <https://savannah.gnu.org/bugs/?66506>.

* gettext-tools/src/its.c: Include <libxml/xmlversion.h>.
(structured_error): Adapt to API change.
---

diff --git a/gettext-tools/src/its.c b/gettext-tools/src/its.c
index 8ee7ab40f..3f28f8851 100644
--- a/gettext-tools/src/its.c
+++ b/gettext-tools/src/its.c
@@ -28,6 +28,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+#include <libxml/xmlversion.h>
 #include <libxml/xmlerror.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>
@@ -82,7 +83,13 @@
 /* ----------------------------- Error handling ----------------------------- */
 
 static void
+/* Adapt to API change in libxml 2.12.0.
+   See <https://gitlab.gnome.org/GNOME/libxml2/-/issues/622>.  */
+#if LIBXML_VERSION >= 21200
+structured_error (void *data, const xmlError *err)
+#else
 structured_error (void *data, xmlError *err)
+#endif
 {
   error (0, err->level == XML_ERR_FATAL ? EXIT_FAILURE : 0,
          _("%s error: %s"), "libxml2", err->message);