more work on the XML catalog support. small cleanup seems using list as a
* Makefile.am catalog.c xmlcatalog.c include/libxml/catalog.h:
more work on the XML catalog support.
* parser.c include/libxml/parser.h: small cleanup seems using
list as a public parameter name can give portability troubles
* trionan.c trionan.h xpath.c include/libxml/trionan.h
include/libxml/xpath.h include/libxml/Makefile.am: removed
trionan from the libxml API, added xmlXPathIsInf and xmlXPathIsNaN
wrappers
Daniel
diff --git a/include/libxml/Makefile.am b/include/libxml/Makefile.am
index 9bf3248..38ad0ef 100644
--- a/include/libxml/Makefile.am
+++ b/include/libxml/Makefile.am
@@ -29,8 +29,7 @@
xmlversion.h \
xmlwin32version.h \
DOCBparser.h \
- catalog.h \
- trionan.h
+ catalog.h
install-exec-hook:
$(mkinstalldirs) $(DESTDIR)$(xmlincdir) $(DESTDIR)$(xmlincdir)/libxml
diff --git a/include/libxml/catalog.h b/include/libxml/catalog.h
index 1a62bb2..8651dfd 100644
--- a/include/libxml/catalog.h
+++ b/include/libxml/catalog.h
@@ -42,7 +42,7 @@
void xmlCatalogDump (FILE *out);
const xmlChar * xmlCatalogGetSystem (const xmlChar *sysID);
const xmlChar * xmlCatalogGetPublic (const xmlChar *pubID);
-const xmlChar * xmlCatalogResolve (const xmlChar *pubID,
+xmlChar * xmlCatalogResolve (const xmlChar *pubID,
const xmlChar *sysID);
int xmlCatalogAdd (const xmlChar *type,
const xmlChar *orig,
diff --git a/include/libxml/parser.h b/include/libxml/parser.h
index 4b84cf6..de0bebb 100644
--- a/include/libxml/parser.h
+++ b/include/libxml/parser.h
@@ -471,18 +471,18 @@
void *user_data,
int depth,
const xmlChar *string,
- xmlNodePtr *list);
+ xmlNodePtr *lst);
int xmlParseExternalEntity (xmlDocPtr doc,
xmlSAXHandlerPtr sax,
void *user_data,
int depth,
const xmlChar *URL,
const xmlChar *ID,
- xmlNodePtr *list);
+ xmlNodePtr *lst);
int xmlParseCtxtExternalEntity(xmlParserCtxtPtr ctx,
const xmlChar *URL,
const xmlChar *ID,
- xmlNodePtr *list);
+ xmlNodePtr *lst);
/*
* SAX initialization routines
diff --git a/include/libxml/trionan.h b/include/libxml/trionan.h
deleted file mode 100644
index f955198..0000000
--- a/include/libxml/trionan.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*************************************************************************
- *
- * $Id$
- *
- * Copyright (C) 2001 Bjorn Reese <breese@users.sourceforge.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS AND
- * CONTRIBUTORS ACCEPT NO RESPONSIBILITY IN ANY CONCEIVABLE MANNER.
- *
- ************************************************************************/
-
-#ifndef __TRIO_NAN_H__
-#define __TRIO_NAN_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Return NaN (Not-a-Number).
- */
-double trio_nan(void);
-
-/*
- * Return positive infinity.
- */
-double trio_pinf(void);
-
-/*
- * Return negative infinity.
- */
-double trio_ninf(void);
-
-/*
- * If number is a NaN return non-zero, otherwise return zero.
- */
-int trio_isnan(double number);
-
-/*
- * If number is positive infinity return 1, if number is negative
- * infinity return -1, otherwise return 0.
- */
-int trio_isinf(double number);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __TRIO_NAN_H__ */
diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h
index 78cb0ca..8479056 100644
--- a/include/libxml/xpath.h
+++ b/include/libxml/xpath.h
@@ -295,6 +295,9 @@
LIBXML_DLL_IMPORT extern double xmlXPathPINF;
LIBXML_DLL_IMPORT extern double xmlXPathNINF;
+int xmlXPathIsNaN (double val);
+int xmlXPathIsInf (double val);
+
/* These macros may later turn into functions */
/**
* xmlXPathNodeSetGetLength: