From: Rob Richards <rrichards@php.net>
Date: Sun, 7 Dec 2003 11:11:47 +0000 (+0000)
Subject: fix warning for shared debug
X-Git-Tag: php-5.0.0b3RC1~216
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44f59d6d7f08ebea38b963e33f928d9547eeb89c;p=php

fix warning for shared debug
fix test bug26384 - WS issue
---

diff --git a/ext/xsl/config.w32 b/ext/xsl/config.w32
index 3eb0aafeba..dc16abdbb9 100644
--- a/ext/xsl/config.w32
+++ b/ext/xsl/config.w32
@@ -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");
diff --git a/ext/xsl/tests/area_list.xsl b/ext/xsl/tests/area_list.xsl
index 45b6cffefa..e0c88c6215 100644
--- a/ext/xsl/tests/area_list.xsl
+++ b/ext/xsl/tests/area_list.xsl
@@ -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, '&quot;', ''), 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, '&quot;', ''), 1, 1)"/>
+<xsl:template match="*">
+    HERE
+</xsl:template>
+</xsl:stylesheet>
diff --git a/ext/xsl/tests/area_name.xml b/ext/xsl/tests/area_name.xml
index 55e38cda69..76cea58511 100644
--- a/ext/xsl/tests/area_name.xml
+++ b/ext/xsl/tests/area_name.xml
@@ -1,9 +1,12 @@
-<?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>
-
+<?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>
+
+
+