Re: cvs: php4 /ext/xml xml.c

On Sun, 25 May 2003, Sebastian Bergmann wrote: >sebastian Sun May 25 03:23:41 2003 EDT > > Modified files: > /php4/ext/xml xml.c > Log: > Hopefully get correct display of version information. > >Index: php4/ext/xml/xml.c >diff -u php4/ext/xml/xml.c:1.126 php4/ext/xml/xml.c:1.127 >--- php4/ext/xml/xml.c:1.126 Wed May 21 23:08:48 2003 >+++ php4/ext/xml/xml.c Sun May 25 03:23:41 2003 >@@ -18,7 +18,7 @@ > +----------------------------------------------------------------------+ > */ > >-/* $Id: xml.c,v 1.126 2003/05/22 03:08:48 sterling Exp $ */ >+/* $Id: xml.c,v 1.127 2003/05/25 07:23:41 sebastian Exp $ */ > > #define IS_EXT_MODULE > >@@ -261,7 +261,11 @@ > php_info_print_table_start(); > php_info_print_table_row(2, "XML Support", "active"); > php_info_print_table_row(2, "XML Namespace Support", "active"); >- php_info_print_table_row(2, "EXPAT Version",XML_ExpatVersion()); >+#ifdef LIBXML_DOTTED_VERSION >+ php_info_print_table_row(2, "libxml2 Version", LIBXML_DOTTED_VERSION); >+#else >+ php_info_print_table_row(2, "EXPAT Version", XML_ExpatVersion()); >+#endif > php_info_print_table_end(); > } > /* }}} */ Wouldn't it be better to fix XML_ExpatVersion() in ext/xml/compat.c and make it return LIBXML_DOTTED_VERSION, as it should. Also, use HAVE_LIBEXPAT instead for the #ifdef. --Jani