started integrating the non-controversial parts of Gary Pennington
* HTMLtree.c catalog.c debugXML.c entities.c nanoftp.c
parser.c valid.c xmlmemory.c xpath.c xpointer.c: started
integrating the non-controversial parts of Gary Pennington
multithread patches
* catalog.c: corrected a small bug introduced
Daniel
diff --git a/HTMLtree.c b/HTMLtree.c
index cc61ef9..030dce6 100644
--- a/HTMLtree.c
+++ b/HTMLtree.c
@@ -451,8 +451,8 @@
}
if (cur->type == HTML_TEXT_NODE) {
if (cur->content != NULL) {
- if (((cur->name == xmlStringText) ||
- (cur->name != xmlStringTextNoenc)) &&
+ if (((cur->name == (const xmlChar *)xmlStringText) ||
+ (cur->name != (const xmlChar *)xmlStringTextNoenc)) &&
((cur->parent == NULL) ||
(!xmlStrEqual(cur->parent->name, BAD_CAST "script")))) {
xmlChar *buffer;
@@ -949,8 +949,8 @@
}
if (cur->type == HTML_TEXT_NODE) {
if (cur->content != NULL) {
- if (((cur->name == xmlStringText) ||
- (cur->name != xmlStringTextNoenc)) &&
+ if (((cur->name == (const xmlChar *)xmlStringText) ||
+ (cur->name != (const xmlChar *)xmlStringTextNoenc)) &&
((cur->parent == NULL) ||
(!xmlStrEqual(cur->parent->name, BAD_CAST "script")))) {
xmlChar *buffer;