mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 01:26:39 -04:00
dedcd8bf50
libxml2 2.12.0 added const to one of the arguments of the error callback function, changing its signature. Check the libxml2 version so the function definition uses the proper type to fix the build breakage. PR: 281612 Reported by: Daniel Engberg <diizzy@FreeBSD.org>
28 lines
967 B
C++
28 lines
967 B
C++
--- unoxml/source/xpath/xpathapi.cxx.orig 2020-10-06 14:16:35 UTC
|
|
+++ unoxml/source/xpath/xpathapi.cxx
|
|
@@ -267,7 +267,11 @@ namespace XPath
|
|
return selectSingleNode(contextNode, expr);
|
|
}
|
|
|
|
- static OUString make_error_message(xmlErrorPtr pError)
|
|
+#if LIBXML_VERSION >= 21200
|
|
+ static OUString make_error_message(const xmlError *pError)
|
|
+#else
|
|
+ static OUString make_error_message(xmlError *pError)
|
|
+#endif
|
|
{
|
|
::rtl::OUStringBuffer buf;
|
|
if (pError->message) {
|
|
@@ -312,7 +316,11 @@ namespace XPath
|
|
OSL_ENSURE(sal_False, msg.getStr());
|
|
}
|
|
|
|
- static void structured_error_func(void * userData, xmlErrorPtr error)
|
|
+#if LIBXML_VERSION >= 21200
|
|
+ static void structured_error_func(void * userData, const xmlError *error)
|
|
+#else
|
|
+ static void structured_error_func(void * userData, xmlError *error)
|
|
+#endif
|
|
{
|
|
(void) userData;
|
|
::rtl::OUStringBuffer buf(
|