aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--doc/examples/xpath1.c4
-rw-r--r--doc/examples/xpath2.c2
-rw-r--r--xmlmodule.c3
4 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2219c98e..eec89454 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Mar 10 11:35:57 CET 2005 Daniel Veillard <daniel@veillard.com>
+
+ * xmlmodule.c: second patch from Rick Jones, portability fix for
+ HP-UX
+ * doc/examples/xpath1.c doc/examples/xpath2.c: first fix from Rick Jones
+ to avoid warnings.
+
Thu Mar 10 10:20:23 CET 2005 Daniel Veillard <daniel@veillard.com>
* include/libxml/hash.h libxml.h libxml.spec.in: some gcc4 portability
diff --git a/doc/examples/xpath1.c b/doc/examples/xpath1.c
index be1dd2aa..f2f74062 100644
--- a/doc/examples/xpath1.c
+++ b/doc/examples/xpath1.c
@@ -21,7 +21,7 @@
#if defined(LIBXML_XPATH_ENABLED) && defined(LIBXML_SAX1_ENABLED)
-void usage(const char *name);
+static void usage(const char *name);
int execute_xpath_expression(const char* filename, const xmlChar* xpathExpr, const xmlChar* nsList);
int register_namespaces(xmlXPathContextPtr xpathCtx, const xmlChar* nsList);
void print_xpath_nodes(xmlNodeSetPtr nodes, FILE* output);
@@ -61,7 +61,7 @@ main(int argc, char **argv) {
*
* Prints usage information.
*/
-void
+static void
usage(const char *name) {
assert(name);
diff --git a/doc/examples/xpath2.c b/doc/examples/xpath2.c
index eee771a1..6ff4008a 100644
--- a/doc/examples/xpath2.c
+++ b/doc/examples/xpath2.c
@@ -63,7 +63,7 @@ main(int argc, char **argv) {
*
* Prints usage information.
*/
-void
+static void
usage(const char *name) {
assert(name);
diff --git a/xmlmodule.c b/xmlmodule.c
index fcd4c335..b057371f 100644
--- a/xmlmodule.c
+++ b/xmlmodule.c
@@ -237,7 +237,7 @@ xmlModulePlatformSymbol(void *handle, const char *name, void **symbol)
return 0;
}
-#endif /* HAVE_DLOPEN */
+#else /* ! HAVE_DLOPEN */
#ifdef HAVE_SHLLOAD /* HAVE_SHLLOAD */
#ifdef HAVE_DL_H
@@ -285,6 +285,7 @@ xmlModulePlatformSymbol(void *handle, const char *name, void **symbol)
}
#endif /* HAVE_SHLLOAD */
+#endif /* ! HAVE_DLOPEN */
#ifdef _WIN32