further small changes to elminate most of the remaining warnings.
* error.c trionan.[ch] testThreads.c python/generator.py:
further small changes to elminate most of the remaining
warnings.
diff --git a/ChangeLog b/ChangeLog
index e0838c0..03670fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug 6 12:32:11 HKT 2003 William Brack <wbrack@mmm.com.hk>
+
+ * error.c trionan.[ch] testThreads.c python/generator.py:
+ further small changes to elminate most of the remaining
+ warnings.
+
Tue Aug 5 23:51:21 HKT 2003 William Brack <wbrack@mmm.com.hk>
* error.c HTMLparser.c testC14N.c testHTML.c testURI.c
diff --git a/error.c b/error.c
index 7071030..5b5c289 100644
--- a/error.c
+++ b/error.c
@@ -11,7 +11,6 @@
#include <stdarg.h>
#include <libxml/parser.h>
-#include <libxml/parserInternals.h> /* for char constants */
#include <libxml/xmlerror.h>
#include <libxml/xmlmemory.h>
#include <libxml/globals.h>
diff --git a/python/generator.py b/python/generator.py
index c65728c..732b8b9 100755
--- a/python/generator.py
+++ b/python/generator.py
@@ -365,8 +365,8 @@
if args[1][1] == "char *" or args[1][1] == "xmlChar *":
c_call = "\n if (%s->%s != NULL) xmlFree(%s->%s);\n" % (
args[0][0], args[1][0], args[0][0], args[1][0])
- c_call = c_call + " %s->%s = xmlStrdup((const xmlChar *)%s);\n" % (args[0][0],
- args[1][0], args[1][0])
+ c_call = c_call + " %s->%s = (%s)xmlStrdup((const xmlChar *)%s);\n" % (args[0][0],
+ args[1][0], args[1][1], args[1][0])
else:
c_call = "\n %s->%s = %s;\n" % (args[0][0], args[1][0],
args[1][0])
@@ -553,6 +553,7 @@
# wrapper.write("#include \"config.h\"\n")
wrapper.write("#include <libxml/xmlversion.h>\n")
wrapper.write("#include <libxml/tree.h>\n")
+ wrapper.write("#include <libxml/xmlschemastypes.h>\n")
wrapper.write("#include \"libxml_wrap.h\"\n")
wrapper.write("#include \"libxml2-py.h\"\n\n")
for function in functions.keys():
diff --git a/testThreads.c b/testThreads.c
index 1479d8d..24633ee 100644
--- a/testThreads.c
+++ b/testThreads.c
@@ -84,7 +84,7 @@
}
int
-main()
+main(void)
{
unsigned int i, repeat;
unsigned int num_threads = sizeof(testfiles) / sizeof(testfiles[0]);
diff --git a/trionan.c b/trionan.c
index 7e48b36..2e276d8 100644
--- a/trionan.c
+++ b/trionan.c
@@ -500,7 +500,8 @@
#endif
}
-
+#if 0
+ /* Temporary fix - this routine is not used anywhere */
/**
Check for finity.
@@ -542,6 +543,7 @@
#endif
}
+#endif
/*
* The sign of NaN is always false
@@ -729,6 +731,8 @@
return is_negative;
}
+#if 0
+ /* Temporary fix - this routine is not used in libxml */
/**
Examine the class of a number.
@@ -745,6 +749,7 @@
return trio_fpclassify_and_signbit(number, &dummy);
}
+#endif
/** @} SpecialQuantities */
diff --git a/trionan.h b/trionan.h
index bed0c12..c5de32b 100644
--- a/trionan.h
+++ b/trionan.h
@@ -66,11 +66,14 @@
/*
* If number is finite return non-zero, otherwise return zero.
*/
+#if 0
+ /* Temporary fix - these 2 routines not used in libxml */
TRIO_PUBLIC int trio_isfinite TRIO_PROTO((double number));
-TRIO_PUBLIC int trio_signbit TRIO_PROTO((double number));
-
TRIO_PUBLIC int trio_fpclassify TRIO_PROTO((double number));
+#endif
+
+TRIO_PUBLIC int trio_signbit TRIO_PROTO((double number));
TRIO_PUBLIC int trio_fpclassify_and_signbit TRIO_PROTO((double number, int *is_negative));