added setting of TRIO_REPLACE_STDIO when TRIO routines are required.

* xsltconfig.h.in: added setting of TRIO_REPLACE_STDIO when TRIO
  routines are required.
* namespaces.c, xsltutils.c: enhanced handling of stdio.h vs. trio.h
  when trio routines are required (now use XSLT_NEED_TRIO)
  (bug #412787)

svn path=/trunk/; revision=1423

5 files changed, 25 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index c157609a..7c2ce2d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-Sun Feb 18 09:00:08 PST 2007 William Brack <wbrack@mmm.com.hk
+Fri Mar  2 18:45:48 HKT 2007 William Brack <wbrack@mmm.com.hk>
+
+	* libxslt/xsltconfig.h.in: added setting of TRIO_REPLACE_STDIO
+	  when TRIO routines are required.
+	* libxslt/namespaces.c, libxslt/xsltutils.c: enhanced handling
+	  of stdio.h vs. trio.h when trio routines are required (now
+	  use XSLT_NEED_TRIO) (bug #412787)
+
+Sun Feb 18 09:00:08 PST 2007 William Brack <wbrack@mmm.com.hk>
 
 	* python/libxsl.py: fixed tab/space inconsistency with patch
 	  provided by Andreas Hanke (bug #409193)
diff --git a/doc/EXSLT/downloads.html b/doc/EXSLT/downloads.html
index 223ecefa..88295e55 100644
--- a/doc/EXSLT/downloads.html
+++ b/doc/EXSLT/downloads.html
@@ -20,7 +20,7 @@ provides <a href="http://garypennington.net/libxml2/">Solaris binaries</a>.
 <a href="mailto:Steve.Ball@zveno.com">Steve Ball</a> provides <a href="http://www.zveno.com/open_source/libxml2xslt.html">Mac Os X
 binaries</a>.</p><p><a name="Contribs" id="Contribs">Contribs:</a></p><p>I do accept external contributions, especially if compiling on another
 platform, get in touch with me to upload the package. I will keep them in the
-<a href="ftp://xmlsoft.org/contribs/">contrib directory</a></p><p>Libxslt is also available from CVS:</p><ul><li><p>The <a href="http://cvs.gnome.org/bonsai/rview.cgi?cvsroot=/cvs/gnome">Gnome
+<a href="ftp://xmlsoft.org/contribs/">contrib directory</a></p><p>Libxslt is also available from CVS:</p><ul><li><p>The <a href="http://cvs.gnome.org/bonsai/rview.cgi?cvsroot=/cvs/gnome&amp;dir=libxslt">Gnome
     CVS base</a>. Check the <a href="http://developer.gnome.org/tools/cvs.html">Gnome CVS Tools</a>
     page; the CVS module is <b>libxslt</b>.</p>
   </li>
diff --git a/libxslt/namespaces.c b/libxslt/namespaces.c
index a8ba8e2e..6c72746b 100644
--- a/libxslt/namespaces.c
+++ b/libxslt/namespaces.c
@@ -32,6 +32,11 @@
 #ifdef HAVE_CTYPE_H
 #include <ctype.h>
 #endif
+#ifndef	XSLT_NEED_TRIO
+#include <stdio.h>
+#else
+#include <trio.h>
+#endif
 
 #include <libxml/xmlmemory.h>
 #include <libxml/tree.h>
diff --git a/libxslt/xsltconfig.h.in b/libxslt/xsltconfig.h.in
index bd35c08b..a8b5acfb 100644
--- a/libxslt/xsltconfig.h.in
+++ b/libxslt/xsltconfig.h.in
@@ -77,7 +77,7 @@ extern "C" {
 /**
  * XSLT_NEED_TRIO:
  *
- * should be activated in the existing libc library lacks some of the
+ * should be activated if the existing libc library lacks some of the
  * string formatting function, in that case reuse the Trio ones already
  * compiled in the libxml2 library.
  */
@@ -93,6 +93,10 @@ extern "C" {
 #endif
 #endif
 
+#ifdef	XSLT_NEED_TRIO
+#define	TRIO_REPLACE_STDIO
+#endif
+
 /**
  * WITH_XSLT_DEBUGGER:
  *
diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c
index f3007693..375ecfcf 100644
--- a/libxslt/xsltutils.c
+++ b/libxslt/xsltutils.c
@@ -12,7 +12,12 @@
 #define IN_LIBXSLT
 #include "libxslt.h"
 
+#ifndef	XSLT_NEED_TRIO
 #include <stdio.h>
+#else
+#include <trio.h>
+#endif
+
 #include <string.h>
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
@@ -47,11 +52,6 @@
 #endif /* _MS_VER */
 #endif /* WIN32 */
 
-#ifdef XSLT_NEED_TRIO
-#include "trio.h"
-#define vsnprintf trio_vsnprintf
-#endif
-
 /************************************************************************
  * 									*
  * 			Convenience function				*