]> granicus.if.org Git - php/commitdiff
fix warning for shared debug
authorRob Richards <rrichards@php.net>
Sun, 7 Dec 2003 11:11:47 +0000 (11:11 +0000)
committerRob Richards <rrichards@php.net>
Sun, 7 Dec 2003 11:11:47 +0000 (11:11 +0000)
fix test bug26384 - WS issue

ext/xsl/config.w32
ext/xsl/tests/area_list.xsl
ext/xsl/tests/area_name.xml

index 3eb0aafeba9ff283e7a11f938da2a7acbe9ba544..dc16abdbb9bcdf8f4a038a9efaa796f2f69280af 100644 (file)
@@ -20,6 +20,10 @@ if (PHP_XSL != "no") {
                        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 45b6cffefaa6e3c4835de72dd10a6dfd5ffa742d..e0c88c6215a53b160461a5df3aebe026df9d39bb 100644 (file)
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">\r
-       \r
-       <xsl:output method="text" encoding="UTF-8"/>\r
-       \r
-       <xsl:key name="area" match="ROW" use="substring(translate(AREA_NAME, '&quot;', ''), 1, 1)"/>\r
-<xsl:template match="*">\r
-    HERE\r
-</xsl:template>\r
-</xsl:stylesheet>\r
+<?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, '&quot;', ''), 1, 1)"/>
+<xsl:template match="*">
+    HERE
+</xsl:template>
+</xsl:stylesheet>
index 55e38cda6956ce37f78e2b657e0ae5458fc3ec61..76cea58511edc73c78c7f190278bc5d0c0be78e6 100644 (file)
@@ -1,9 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<AREA_NAME>\r
- <ROW>\r
-  <AREA_CODE>13</AREA_CODE>\r
-  <AREA_NAME>&quot;Автово&quot; м.</AREA_NAME>\r
-  <AREA_NAME_ENG>m.&quot;Avtovo&quot;</AREA_NAME_ENG>\r
- </ROW>\r
-</AREA_NAME>\r
-\r
+<?xml version="1.0" encoding="UTF-8"?>
+
+<AREA_NAME>
+ <ROW>
+  <AREA_CODE>13</AREA_CODE>
+  <AREA_NAME>&quot;Автово&quot; м.</AREA_NAME>
+  <AREA_NAME_ENG>m.&quot;Avtovo&quot;</AREA_NAME_ENG>
+ </ROW>
+</AREA_NAME>
+
+
+