From f600e2537f838e9806e80572e8e62abc5ff05d98 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Sat, 18 Dec 1999 15:32:46 +0000 Subject: [PATCH] - Fixed bug #4344 - Fixed C++ problems in headers - Released 1.8.1 Daniel - Fixed bug #4344 - Fixed C++ problems in headers - Released 1.8.1 Daniel --- HTMLparser.h | 8 + configure.in | 2 +- debugXML.h | 6 + doc/html/gnome-xml-entities.html | 52 ++--- doc/html/gnome-xml-htmlparser.html | 74 ++++--- doc/html/gnome-xml-htmltree.html | 20 +- doc/html/gnome-xml-nanohttp.html | 52 +++-- doc/html/gnome-xml-parserinternals.html | 182 +++++++++--------- doc/html/gnome-xml-tree.html | 246 ++++++++++++------------ doc/html/gnome-xml-valid.html | 122 ++++++------ doc/html/gnome-xml-xml-error.html | 52 +++-- doc/html/gnome-xml-xmlmemory.html | 38 ++-- doc/html/gnome-xml-xpath.html | 68 +++++-- doc/html/index.sgml | 6 + include/libxml/HTMLparser.h | 8 + include/libxml/debugXML.h | 6 + include/libxml/nanohttp.h | 6 + include/libxml/xlink.h | 6 + nanohttp.h | 6 + parser.c | 4 + xlink.h | 6 + 21 files changed, 576 insertions(+), 394 deletions(-) diff --git a/HTMLparser.h b/HTMLparser.h index ca9ee146..eed7924b 100644 --- a/HTMLparser.h +++ b/HTMLparser.h @@ -10,6 +10,10 @@ #define __HTML_PARSER_H__ #include "parser.h" +#ifdef __cplusplus +#define extern "C" { +#endif + /* * Most of the back-end structures from XML and HTML are shared */ @@ -62,4 +66,8 @@ htmlDocPtr htmlSAXParseFile(const char *filename, const char *encoding, htmlSAXHandlerPtr sax, void *userData); htmlDocPtr htmlParseFile(const char *filename, const char *encoding); +#ifdef __cplusplus +} +#endif + #endif /* __HTML_PARSER_H__ */ diff --git a/configure.in b/configure.in index 4c50f341..53ac7a9f 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ AM_CONFIG_HEADER(config.h) LIBXML_MAJOR_VERSION=1 LIBXML_MINOR_VERSION=8 -LIBXML_MICRO_VERSION=0 +LIBXML_MICRO_VERSION=1 LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION diff --git a/debugXML.h b/debugXML.h index b24219ae..5bec396f 100644 --- a/debugXML.h +++ b/debugXML.h @@ -9,6 +9,9 @@ #define __DEBUG_XML__ #include "tree.h" +#ifdef __cplusplus +#define extern "C" { +#endif extern void xmlDebugDumpString(FILE *output, const xmlChar *str); extern void xmlDebugDumpAttr(FILE *output, xmlAttrPtr attr, int depth); extern void xmlDebugDumpAttrList(FILE *output, xmlAttrPtr attr, int depth); @@ -17,4 +20,7 @@ extern void xmlDebugDumpNode(FILE *output, xmlNodePtr node, int depth); extern void xmlDebugDumpNodeList(FILE *output, xmlNodePtr node, int depth); extern void xmlDebugDumpDocument(FILE *output, xmlDocPtr doc); extern void xmlDebugDumpEntities(FILE *output, xmlDocPtr doc); +#ifdef __cplusplus +} +#endif #endif /* __DEBUG_XML__ */ diff --git a/doc/html/gnome-xml-entities.html b/doc/html/gnome-xml-entities.html index 0e6e2575..119396df 100644 --- a/doc/html/gnome-xml-entities.html +++ b/doc/html/gnome-xml-entities.html @@ -115,7 +115,7 @@ SIZE="3" >

Name

Synopsis

Description

Details

Name

Synopsis

+#define extern typedef htmlParserCtxt

Description

Details

extern

#define     extern

Name

Synopsis

Description

Details

Name

Synopsis

+#define extern int xmlNanoHTTPFetch

Description

Details

extern

#define     extern

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

Description

Details

Name

Synopsis

+#define extern enum xmlParserErrors

Description

Details

extern

#define     extern

Name

Synopsis

Description

Details

Name

Synopsis

+#define extern #define XPATH_UNDEFINED

Description

Details

extern

#define     extern

+ @@ -323,6 +324,7 @@ + @@ -331,6 +333,7 @@ + @@ -357,6 +360,7 @@ + @@ -373,6 +377,7 @@ + @@ -491,6 +496,7 @@ + diff --git a/include/libxml/HTMLparser.h b/include/libxml/HTMLparser.h index ca9ee146..eed7924b 100644 --- a/include/libxml/HTMLparser.h +++ b/include/libxml/HTMLparser.h @@ -10,6 +10,10 @@ #define __HTML_PARSER_H__ #include "parser.h" +#ifdef __cplusplus +#define extern "C" { +#endif + /* * Most of the back-end structures from XML and HTML are shared */ @@ -62,4 +66,8 @@ htmlDocPtr htmlSAXParseFile(const char *filename, const char *encoding, htmlSAXHandlerPtr sax, void *userData); htmlDocPtr htmlParseFile(const char *filename, const char *encoding); +#ifdef __cplusplus +} +#endif + #endif /* __HTML_PARSER_H__ */ diff --git a/include/libxml/debugXML.h b/include/libxml/debugXML.h index b24219ae..5bec396f 100644 --- a/include/libxml/debugXML.h +++ b/include/libxml/debugXML.h @@ -9,6 +9,9 @@ #define __DEBUG_XML__ #include "tree.h" +#ifdef __cplusplus +#define extern "C" { +#endif extern void xmlDebugDumpString(FILE *output, const xmlChar *str); extern void xmlDebugDumpAttr(FILE *output, xmlAttrPtr attr, int depth); extern void xmlDebugDumpAttrList(FILE *output, xmlAttrPtr attr, int depth); @@ -17,4 +20,7 @@ extern void xmlDebugDumpNode(FILE *output, xmlNodePtr node, int depth); extern void xmlDebugDumpNodeList(FILE *output, xmlNodePtr node, int depth); extern void xmlDebugDumpDocument(FILE *output, xmlDocPtr doc); extern void xmlDebugDumpEntities(FILE *output, xmlDocPtr doc); +#ifdef __cplusplus +} +#endif #endif /* __DEBUG_XML__ */ diff --git a/include/libxml/nanohttp.h b/include/libxml/nanohttp.h index 8551156b..7b2fd3d8 100644 --- a/include/libxml/nanohttp.h +++ b/include/libxml/nanohttp.h @@ -8,6 +8,9 @@ #ifndef __NANO_HTTP_H__ #define __NANO_HTTP_H__ +#ifdef __cplusplus +#define extern "C" { +#endif int xmlNanoHTTPFetch (const char *URL, const char *filename, char **contentType); @@ -25,4 +28,7 @@ int xmlNanoHTTPRead (void *ctx, int xmlNanoHTTPSave (void *ctxt, const char *filename); void xmlNanoHTTPClose (void *ctx); +#ifdef __cplusplus +} +#endif #endif /* __NANO_HTTP_H__ */ diff --git a/include/libxml/xlink.h b/include/libxml/xlink.h index 7d1025f1..15331481 100644 --- a/include/libxml/xlink.h +++ b/include/libxml/xlink.h @@ -15,6 +15,9 @@ #include "tree.h" +#ifdef __cplusplus +#define extern "C" { +#endif /** * Various defines for the various Link properties. * @@ -172,4 +175,7 @@ void xlinkSetDefaultHandler (xlinkHandlerPtr handler); xlinkType xlinkIsLink (xmlDocPtr doc, xmlNodePtr node); +#ifdef __cplusplus +} +#endif #endif /* __XML_XLINK_H__ */ diff --git a/nanohttp.h b/nanohttp.h index 8551156b..7b2fd3d8 100644 --- a/nanohttp.h +++ b/nanohttp.h @@ -8,6 +8,9 @@ #ifndef __NANO_HTTP_H__ #define __NANO_HTTP_H__ +#ifdef __cplusplus +#define extern "C" { +#endif int xmlNanoHTTPFetch (const char *URL, const char *filename, char **contentType); @@ -25,4 +28,7 @@ int xmlNanoHTTPRead (void *ctx, int xmlNanoHTTPSave (void *ctxt, const char *filename); void xmlNanoHTTPClose (void *ctx); +#ifdef __cplusplus +} +#endif #endif /* __NANO_HTTP_H__ */ diff --git a/parser.c b/parser.c index eef47211..e9a95f4d 100644 --- a/parser.c +++ b/parser.c @@ -4186,6 +4186,10 @@ xmlParseElementMixedContentDecl(xmlParserCtxtPtr ctxt) { if (CUR == ')') { NEXT; ret = xmlNewElementContent(NULL, XML_ELEMENT_CONTENT_PCDATA); + if (CUR == '*') { + ret->ocur = XML_ELEMENT_CONTENT_MULT; + NEXT; + } return(ret); } if ((CUR == '(') || (CUR == '|')) { diff --git a/xlink.h b/xlink.h index 7d1025f1..15331481 100644 --- a/xlink.h +++ b/xlink.h @@ -15,6 +15,9 @@ #include "tree.h" +#ifdef __cplusplus +#define extern "C" { +#endif /** * Various defines for the various Link properties. * @@ -172,4 +175,7 @@ void xlinkSetDefaultHandler (xlinkHandlerPtr handler); xlinkType xlinkIsLink (xmlDocPtr doc, xmlNodePtr node); +#ifdef __cplusplus +} +#endif #endif /* __XML_XLINK_H__ */