rrichards Sun Dec 7 06:11:48 2003 EDT Modified files: /php-src/ext/xsl config.w32 /php-src/ext/xsl/tests area_list.xsl area_name.xml Log: fix warning for shared debug fix test bug26384 - WS issue Index: php-src/ext/xsl/config.w32 diff -u php-src/ext/xsl/config.w32:1.6 php-src/ext/xsl/config.w32:1.7 --- php-src/ext/xsl/config.w32:1.6 Fri Dec 5 16:24:48 2003 +++ php-src/ext/xsl/config.w32 Sun Dec 7 06:11:46 2003 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.6 2003/12/05 21:24:48 rrichards Exp $ +// $Id: config.w32,v 1.7 2003/12/07 11:11:46 rrichards Exp $ // vim: ft=javascript ARG_WITH("xsl", "xsl support", "no"); @@ -20,6 +20,10 @@ AC_DEFINE("HAVE_XSL", 1, "Define if xsl extension is enabled"); if (! PHP_XSL_SHARED) { ADD_FLAG("CFLAGS_XSL", "/D DOM_EXPORTS /D LIBXML_STATIC"); + } else { + if (PHP_DEBUG == "yes") { + ADD_FLAG("LDFLAGS_XSL", "/nodefaultlib:msvcrt"); + } } } else { WARNING("xsl not enabled; libraries and headers not found"); Index: php-src/ext/xsl/tests/area_list.xsl diff -u php-src/ext/xsl/tests/area_list.xsl:1.1 php-src/ext/xsl/tests/area_list.xsl:1.2 --- php-src/ext/xsl/tests/area_list.xsl:1.1 Sat Nov 29 11:38:09 2003 +++ php-src/ext/xsl/tests/area_list.xsl Sun Dec 7 06:11:47 2003 @@ -1,10 +1,10 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - - <xsl:output method="text" encoding="UTF-8"/> - - <xsl:key name="area" match="ROW" use="substring(translate(AREA_NAME, '"', ''), 1, 1)"/> -<xsl:template match="*"> - HERE -</xsl:template> -</xsl:stylesheet> +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> + + <xsl:output method="text" encoding="UTF-8"/> + + <xsl:key name="area" match="ROW" use="substring(translate(AREA_NAME, '"', ''), 1, 1)"/> +<xsl:template match="*"> + HERE +</xsl:template> +</xsl:stylesheet> Index: php-src/ext/xsl/tests/area_name.xml diff -u php-src/ext/xsl/tests/area_name.xml:1.1 php-src/ext/xsl/tests/area_name.xml:1.2 --- php-src/ext/xsl/tests/area_name.xml:1.1 Sat Nov 29 11:38:09 2003 +++ php-src/ext/xsl/tests/area_name.xml Sun Dec 7 06:11:47 2003 @@ -1,9 +1,12 @@ -<?xml version="1.0" encoding="UTF-8"?> -<AREA_NAME> - <ROW> - <AREA_CODE>13</AREA_CODE> - <AREA_NAME>"Автово" м.</AREA_NAME> - <AREA_NAME_ENG>m."Avtovo"</AREA_NAME_ENG> - </ROW> -</AREA_NAME> - +<?xml version="1.0" encoding="UTF-8"?> + +<AREA_NAME> + <ROW> + <AREA_CODE>13</AREA_CODE> + <AREA_NAME>"Автово" м.</AREA_NAME> + <AREA_NAME_ENG>m."Avtovo"</AREA_NAME_ENG> + </ROW> +</AREA_NAME> + + +
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php