more cleanup of the problems introduced with EXSLT, also closes bug #58180

* libexslt/functions.c libxslt/extensions.[ch] libxslt/extensions.h
  libxslt/xslt.[hc] libxslt/xsltInternals.h xsltproc/xsltproc.c:
  more cleanup of the problems introduced with EXSLT, also closes
  bug #58180
Daniel

1 files changed, 7 insertions, 3 deletions

diff --git a/libexslt/functions.c b/libexslt/functions.c
index 56c293d7..d4f31482 100644
--- a/libexslt/functions.c
+++ b/libexslt/functions.c
@@ -1,14 +1,18 @@
+#include "libxslt/libxslt.h"
+
 #include <string.h>
 
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 #include <libxml/hash.h>
+#include <libxml/debugXML.h>
 
 #include <libxslt/xsltutils.h>
 #include <libxslt/variables.h>
 #include <libxslt/xsltInternals.h>
 #include <libxslt/extensions.h>
+#include <libxslt/transform.h>
 
 #include "exslt.h"
 
@@ -167,7 +171,6 @@ exsltFuncNewFunctionData (void) {
 static void
 exsltFuncFunctionFunction (xmlXPathParserContextPtr ctxt, int nargs) {
     xmlXPathObjectPtr obj, oldResult, ret;
-    xmlHashTablePtr funcs;
     exsltFuncData *data;
     exsltFuncFunctionData *func;
     xmlNodePtr paramNode, oldInsert, fake;
@@ -340,8 +343,9 @@ exsltFuncFunctionComp (xsltStylesheetPtr style, xmlNodePtr inst) {
 }
 
 static void
-exsltFuncResultElem (xsltTransformContextPtr ctxt, xmlNodePtr node,
-		     xmlNodePtr inst, xsltStylePreCompPtr comp) {
+exsltFuncResultElem (xsltTransformContextPtr ctxt,
+	             xmlNodePtr node ATTRIBUTE_UNUSED, xmlNodePtr inst,
+		     xsltStylePreCompPtr comp ATTRIBUTE_UNUSED) {
     xmlNodePtr test;
     xmlChar *select;
     exsltFuncData *data;