diff --git a/ChangeLog b/ChangeLog index 6f248eb7..d6dec783 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 21 09:55:21 CET 2002 Daniel Veillard + + * xpath.c include/libxml/xpathInternals.h: the change made to + xmlXPathFuncLookupFunc was incompatible roll it back + Sun Jan 20 23:03:41 CET 2002 Daniel Veillard * SAX.c: cleanup patch from Anthony Jones diff --git a/include/libxml/xpathInternals.h b/include/libxml/xpathInternals.h index 5ffa4414..2b53c9f8 100644 --- a/include/libxml/xpathInternals.h +++ b/include/libxml/xpathInternals.h @@ -335,7 +335,7 @@ void xmlXPathRegisterVariableLookup (xmlXPathContextPtr ctxt, /* * Function Lookup forwarding */ -typedef xmlXPathFunction xmlXPathFuncLookupFunc (void *ctxt, +typedef xmlXPathFunction (*xmlXPathFuncLookupFunc) (void *ctxt, const xmlChar *name, const xmlChar *ns_uri); diff --git a/xpath.c b/xpath.c index 9b07ce63..f7120644 100644 --- a/xpath.c +++ b/xpath.c @@ -2291,9 +2291,9 @@ xmlXPathFunctionLookup(xmlXPathContextPtr ctxt, const xmlChar *name) { if (ctxt->funcLookupFunc != NULL) { xmlXPathFunction ret; - xmlXPathFuncLookupFunc *f; + xmlXPathFuncLookupFunc f; - f = (xmlXPathFuncLookupFunc *) ctxt->funcLookupFunc; + f = (xmlXPathFuncLookupFunc) ctxt->funcLookupFunc; ret = f(ctxt->funcLookupData, name, NULL); if (ret != NULL) return(ret); @@ -2322,9 +2322,9 @@ xmlXPathFunctionLookupNS(xmlXPathContextPtr ctxt, const xmlChar *name, if (ctxt->funcLookupFunc != NULL) { xmlXPathFunction ret; - xmlXPathFuncLookupFunc *f; + xmlXPathFuncLookupFunc f; - f = (xmlXPathFuncLookupFunc *) ctxt->funcLookupFunc; + f = (xmlXPathFuncLookupFunc) ctxt->funcLookupFunc; ret = f(ctxt->funcLookupData, name, ns_uri); if (ret != NULL) return(ret);