TextReader: xmlStructuredErrorFunc() changed in libxml2 2.12.0

kjellahl · kjellahl · commit e53842bb1763 · 2024-11-07T14:58:27.000+01:00
Before 2.12.0: typedef void (*xmlStructuredErrorFunc) (void *userData, xmlError *error);
Since 2.12.0: typedef void (*xmlStructuredErrorFunc) (void *userData, const xmlError *error);

* libxml++/parsers/textreader.cc: The declaration of c_callback_error()
must fit the libxml2 version being compiled with. As it's a function with
C linkage, its name is not mangled. It's not an ABI break.
diff --git a/libxml++/parsers/textreader.cc b/libxml++/parsers/textreader.cc
@@ -5,6 +5,7 @@
 #include <libxml++/document.h>
 
 #include <libxml/xmlreader.h>
+#include <libxml/xmlversion.h>
 
 namespace
 {
@@ -16,7 +17,11 @@ ErrorFuncType p_callback_error;
 
 extern "C"
 {
+#if LIBXML_VERSION >= 21200
 static void c_callback_error(void* userData, const xmlError* error)
+#else
+static void c_callback_error(void* userData, xmlError* error)
+#endif
 {
   const xmlpp::ustring msg = xmlpp::format_xml_error(error);
 

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`#include <libxml++/document.h>`
`6`	`6`
`7`	`7`	`#include <libxml/xmlreader.h>`
	`8`	`+#include <libxml/xmlversion.h>`
`8`	`9`
`9`	`10`	`namespace`
`10`	`11`	`{`
`@@ -16,7 +17,11 @@ ErrorFuncType p_callback_error;`
`16`	`17`
`17`	`18`	`extern "C"`
`18`	`19`	`{`
	`20`	`+#if LIBXML_VERSION >= 21200`
`19`	`21`	`static void c_callback_error(void* userData, const xmlError* error)`
	`22`	`+#else`
	`23`	`+static void c_callback_error(void* userData, xmlError* error)`
	`24`	`+#endif`
`20`	`25`	`{`
`21`	`26`	`const xmlpp::ustring msg = xmlpp::format_xml_error(error);`
`22`	`27`