Windows build fix

        Turn off the change made in r27984 on Windows for now.

        * xml/XSLTProcessor.cpp:
        (WebCore::XSLTProcessor::transformToString):
        * xml/XSLTUnicodeSort.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28003 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e342bc2f8a7f2c71a32ad3e46ecd877eeb4be8a5..992bf14b7b1db7addfe17735b73f1353ac069df4 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-24  Adam Roben  <aroben@apple.com>
+
+        Windows build fix
+
+        Turn off the change made in r27984 on Windows for now.
+
+        * xml/XSLTProcessor.cpp:
+        (WebCore::XSLTProcessor::transformToString):
+        * xml/XSLTUnicodeSort.cpp:
+
 2007-11-24  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by Adam Roben.

diff --git a/WebCore/xml/XSLTProcessor.cpp b/WebCore/xml/XSLTProcessor.cpp
index f7aca06db386e6b18fb650808ff3f80287ab500a..660e2d7722a6cb54664fd1a921fdc06cbf76920f 100644 (file)
--- a/WebCore/xml/XSLTProcessor.cpp
+++ b/WebCore/xml/XSLTProcessor.cpp
@@ -351,7 +351,8 @@ bool XSLTProcessor::transformToString(Node* sourceNode, String& mimeType, String
 
         xsltTransformContextPtr transformContext = xsltNewTransformContext(sheet, sourceDoc);
         registerXSLTExtensions(transformContext);
-#if USE(ICU_UNICODE)
+// FIXME: <rdar://5611712> Remove the PLATFORM(WIN) check once ICU on Windows has collation support.
+#if USE(ICU_UNICODE) && !PLATFORM(WIN)
         // <http://bugs.webkit.org/show_bug.cgi?id=16077>: XSLT processor <xsl:sort> algorithm only compares by code point
         // Only implemented for ICU yet.
         xsltSetCtxtSortFunc(transformContext, xsltUnicodeSortFunction);

diff --git a/WebCore/xml/XSLTUnicodeSort.cpp b/WebCore/xml/XSLTUnicodeSort.cpp
index 1ffc18e391229d0ad47b70266827f13c641f11db..bc0afe5464628204fa5133061fa32a2bd1581894 100644 (file)
--- a/WebCore/xml/XSLTUnicodeSort.cpp
+++ b/WebCore/xml/XSLTUnicodeSort.cpp
@@ -29,7 +29,8 @@
 #include "config.h"
 #include "XSLTUnicodeSort.h"
 
-#if ENABLE(XSLT) && USE(ICU_UNICODE)
+// FIXME: <rdar://5611712> Remove the PLATFORM(WIN) check once ICU on Windows has collation support.
+#if ENABLE(XSLT) && USE(ICU_UNICODE) && !PLATFORM(WIN)
 
 #include <libxslt/templates.h>
 #include <libxslt/xsltutils.h>