Merge branch 'master' of github.com:xml4r/libxml-ruby

cfis · cfis · commit 085ebc39acf6 · 2024-03-11T21:03:15.000-07:00
diff --git a/ext/libxml/ruby_xml_error.c b/ext/libxml/ruby_xml_error.c
@@ -97,7 +97,11 @@ VALUE rxml_error_wrap(const xmlError *xerror)
 }
 
 /* Hook that receives xml error message */
+#if LIBXML_VERSION >= 212000
 static void structuredErrorFunc(void *userData, const xmlError *xerror)
+#else
+static void structuredErrorFunc(void *userData, xmlErrorPtr xerror)
+#endif
 {
   VALUE error = rxml_error_wrap(xerror);
 

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,11 @@ VALUE rxml_error_wrap(const xmlError *xerror)`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`/* Hook that receives xml error message */`
	`100`	`+#if LIBXML_VERSION >= 212000`
`100`	`101`	`static void structuredErrorFunc(void userData, const xmlError xerror)`
	`102`	`+#else`
	`103`	`+static void structuredErrorFunc(void *userData, xmlErrorPtr xerror)`
	`104`	`+#endif`
`101`	`105`	`{`
`102`	`106`	`VALUE error = rxml_error_wrap(xerror);`
`103`	`107`