applied patch from Björn Wiberg to try to fix again the silly
* nanoftp.c: applied patch from Björn Wiberg to try to fix again
the silly __ss_familly problem on various AIXes, should fix #420184
Daniel
svn path=/trunk/; revision=3592
diff --git a/ChangeLog b/ChangeLog
index e46af1d..32d3789 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 20 09:58:13 CET 2007 Daniel Veillard <daniel@veillard.com>
+
+ * nanoftp.c: applied patch from Björn Wiberg to try to fix again
+ the silly __ss_familly problem on various AIXes, should fix #420184
+
Wed Mar 14 20:30:38 HKT 2007 William Brack <wbrack@mmm.com.hk>
* configure.in: corrected small error in last commit
diff --git a/doc/search.php b/doc/search.php
index 7b332c2..7d94cb7 100644
--- a/doc/search.php
+++ b/doc/search.php
@@ -305,7 +305,8 @@
$id = mysql_result($result, $i, 2);
$module = mysql_result($result, $i, 3);
$desc = mysql_result($result, $i, 4);
- $url = $module;
+ if (strncmp($module, "libxml-", 7) == 0) {
+ $url = "html/$module";
if ($id != "") {
$url = $url + "#$id";
}
diff --git a/nanoftp.c b/nanoftp.c
index c78503b..d7c67c2 100644
--- a/nanoftp.c
+++ b/nanoftp.c
@@ -102,8 +102,10 @@
#endif
#ifdef _AIX
+#ifdef HAVE_BROKEN_SS_FAMILY
#define ss_family __ss_family
#endif
+#endif
#ifndef XML_SOCKLEN_T
#define XML_SOCKLEN_T unsigned int
diff --git a/xmlsave.c b/xmlsave.c
index 6963e7b..231ee7b 100644
--- a/xmlsave.c
+++ b/xmlsave.c
@@ -623,7 +623,9 @@
buf = ctxt->buf;
while (cur != NULL) {
if ((ctxt->format) && (xmlIndentTreeOutput) &&
- (cur->type == XML_ELEMENT_NODE))
+ ((cur->type == XML_ELEMENT_NODE) ||
+ (cur->type == XML_COMMENT_NODE) ||
+ (cur->type == XML_PI_NODE)))
xmlOutputBufferWrite(buf, ctxt->indent_size *
(ctxt->level > ctxt->indent_nr ?
ctxt->indent_nr : ctxt->level),