summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam M. Brack <wbrack@src.gnome.org>2007-01-31 18:38:56 +0000
committerWilliam M. Brack <wbrack@src.gnome.org>2007-01-31 18:38:56 +0000
commitc1099be5eb3e78ae6cef1b2c39b21e7b36a59035 (patch)
tree95c026c149e38b66b06781ee902c30db9284732e
parent72239bad3c97cb36ad936bc12d8140fc221b8122 (diff)
downloadlibxml2-c1099be5eb3e78ae6cef1b2c39b21e7b36a59035.tar.gz
repositioned #include for libxml.h to avoid compilation error on some
* testAutomata.c, testRegexp.c, testThreads.c, testThreadsWin32.c, xmlwriter.c: repositioned #include for libxml.h to avoid compilation error on some architectures (bug #398277) svn path=/trunk/; revision=3578
-rw-r--r--ChangeLog7
-rw-r--r--testAutomata.c2
-rw-r--r--testRegexp.c3
-rw-r--r--testThreads.c3
-rw-r--r--testThreadsWin32.c2
-rw-r--r--xmlwriter.c2
6 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 36163e51..a0ef00e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 31 10:25:38 PST 2007 William Brack <wbrack@mmm.com.hk>
+
+ * testAutomata.c, testRegexp.c, testThreads.c, testThreadsWin32.c,
+ xmlwriter.c: repositioned #include for libxml.h to avoid
+ compilation error on some architectures (bug #398277)
+ * fixed screwed-up ChangeLog (deleted some duplicate entries)
+
Fri Jan 26 00:05:18 PST 2007 William Brack <wbrack@mmm.com.hk>
* implemented patch from Stéphane Bidoul for uri.c (bug #389767)
diff --git a/testAutomata.c b/testAutomata.c
index a3969b14..2f575ce5 100644
--- a/testAutomata.c
+++ b/testAutomata.c
@@ -6,9 +6,9 @@
* Daniel Veillard <veillard@redhat.com>
*/
-#include <string.h>
#include "libxml.h"
#ifdef LIBXML_AUTOMATA_ENABLED
+#include <string.h>
#include <libxml/tree.h>
#include <libxml/xmlautomata.h>
diff --git a/testRegexp.c b/testRegexp.c
index ff9c0fc8..d5228b3b 100644
--- a/testRegexp.c
+++ b/testRegexp.c
@@ -6,9 +6,10 @@
* Daniel Veillard <veillard@redhat.com>
*/
-#include <string.h>
#include "libxml.h"
#ifdef LIBXML_REGEXP_ENABLED
+#include <string.h>
+
#include <libxml/tree.h>
#include <libxml/xmlregexp.h>
diff --git a/testThreads.c b/testThreads.c
index 6405a77f..b43cbd0e 100644
--- a/testThreads.c
+++ b/testThreads.c
@@ -1,6 +1,7 @@
+#include "libxml.h"
+
#include <stdlib.h>
#include <stdio.h>
-#include "libxml.h"
#if defined(LIBXML_THREAD_ENABLED) && defined(LIBXML_CATALOG_ENABLED) && defined(LIBXML_SAX1_ENABLED)
#include <libxml/globals.h>
diff --git a/testThreadsWin32.c b/testThreadsWin32.c
index 24f00064..6ed702e5 100644
--- a/testThreadsWin32.c
+++ b/testThreadsWin32.c
@@ -1,6 +1,6 @@
+#include "libxml.h"
#include <stdlib.h>
#include <stdio.h>
-#include "libxml.h"
#if defined(LIBXML_THREAD_ENABLED) && defined(LIBXML_CATALOG_ENABLED)
#include <libxml/globals.h>
diff --git a/xmlwriter.c b/xmlwriter.c
index 74838e6a..2e67a4f9 100644
--- a/xmlwriter.c
+++ b/xmlwriter.c
@@ -9,9 +9,9 @@
*/
#define IN_LIBXML
+#include "libxml.h"
#include <string.h>
-#include "libxml.h"
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
#include <libxml/uri.h>