- Updated HTML test outputs
- Fixed taht f....g problem with C++ and includes,
Daniel
diff --git a/ChangeLog b/ChangeLog
index 9e71635..d1051ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,18 @@
+Mon Dec 20 16:20:55 CET 1999 Daniel Veillard <Daniel.Veillard@w3.org>
+
+ * result/HTML/*.htm[l] : updated the HTML regression tests according
+ to the new output
+ * xpath.h xml-error.h valid.h tree.h parser.h entities.h SAX.h
+ HTMLtree.h tree.c entities.c: headers tweakings to avoid a nasty
+ problem due to intermix of extern "C" { ... } declarations for C++
+ and recursive includes in the headers
+
1999-12-20 Chris Lahey <clahey@umich.edu>
* HTMLtree.c: Made it so that html nodes with a single child do
not insert a carriage return before or after the child node.
-Sat Dec 18 16:07:03 CET 1999
+Sat Dec 18 16:07:03 CET 1999 Daniel Veillard <Daniel.Veillard@w3.org>
* configure.in, doc/xml.html : bug fix release 1.8.1
* parser.c: fixed bug #4344
diff --git a/SAX.h b/SAX.h
index 09ccf3f..bbd0f96 100644
--- a/SAX.h
+++ b/SAX.h
@@ -7,14 +7,14 @@
*/
+#ifndef __XML_SAX_H__
+#define __XML_SAX_H__
+
#include <stdio.h>
#include <stdlib.h>
#include "parser.h"
#include "xlink.h"
-#ifndef __XML_SAX_H__
-#define __XML_SAX_H__
-
#ifdef __cplusplus
#define extern "C" {
#endif
diff --git a/doc/xml.html b/doc/xml.html
index 9c6909c..819585e 100644
--- a/doc/xml.html
+++ b/doc/xml.html
Binary files differ
diff --git a/include/libxml/SAX.h b/include/libxml/SAX.h
index 09ccf3f..bbd0f96 100644
--- a/include/libxml/SAX.h
+++ b/include/libxml/SAX.h
@@ -7,14 +7,14 @@
*/
+#ifndef __XML_SAX_H__
+#define __XML_SAX_H__
+
#include <stdio.h>
#include <stdlib.h>
#include "parser.h"
#include "xlink.h"
-#ifndef __XML_SAX_H__
-#define __XML_SAX_H__
-
#ifdef __cplusplus
#define extern "C" {
#endif
diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h
index 1e5aea4..505fa84 100644
--- a/include/libxml/xpath.h
+++ b/include/libxml/xpath.h
@@ -12,10 +12,11 @@
#ifndef __XML_XPATH_H__
#define __XML_XPATH_H__
+#include "tree.h"
+
#ifdef __cplusplus
#define extern "C" {
#endif
-#include "tree.h"
typedef struct xmlXPathParserContext *xmlXPathParserContextPtr;
diff --git a/xml-error.h b/xml-error.h
index b210e19..169166f 100644
--- a/xml-error.h
+++ b/xml-error.h
@@ -1,10 +1,10 @@
#ifndef __XML_ERROR_H__
#define __XML_ERROR_H__
+#include "parser.h"
#ifdef __cplusplus
#define extern "C" {
#endif
-#include "parser.h"
typedef enum {
XML_ERR_OK = 0,
diff --git a/xpath.h b/xpath.h
index 1e5aea4..505fa84 100644
--- a/xpath.h
+++ b/xpath.h
@@ -12,10 +12,11 @@
#ifndef __XML_XPATH_H__
#define __XML_XPATH_H__
+#include "tree.h"
+
#ifdef __cplusplus
#define extern "C" {
#endif
-#include "tree.h"
typedef struct xmlXPathParserContext *xmlXPathParserContextPtr;