2009-01-04 Darin Adler <darin@apple.com>

        Bug 23086: REGRESSION(r39540/r39541): Windows build fails due to ICU errors
        https://bugs.webkit.org/show_bug.cgi?id=23086

        * editing/TextIterator.cpp: Check UCONFIG_NO_COLLATION and don't compile
        in the new search path if it's 0.

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d7698f5..17cfb19 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-04  Darin Adler  <darin@apple.com>
+
+        Bug 23086: REGRESSION(r39540/r39541): Windows build fails due to ICU errors
+        https://bugs.webkit.org/show_bug.cgi?id=23086
+
+        * editing/TextIterator.cpp: Check UCONFIG_NO_COLLATION and don't compile
+        in the new search path if it's 0.
+
 2009-01-04  David Kilzer  <ddkilzer@apple.com>
 
         Don't install *.idl and *.in files as resources

diff --git a/WebCore/editing/TextIterator.cpp b/WebCore/editing/TextIterator.cpp
index a5a225e..fe38c40 100644 (file)
--- a/WebCore/editing/TextIterator.cpp
+++ b/WebCore/editing/TextIterator.cpp
@@ -69,7 +69,7 @@ public:
     size_t search(size_t& startOffset);
     bool atBreak() const;
 
-#if USE(ICU_UNICODE)
+#if USE(ICU_UNICODE) && !UCONFIG_NO_COLLATION
 
 private:
     String m_target;
@@ -1172,7 +1172,7 @@ const UChar* WordAwareIterator::characters() const
 
 // --------
 
-#if USE(ICU_UNICODE)
+#if USE(ICU_UNICODE) && !UCONFIG_NO_COLLATION
 
 static const size_t minimumSearchBufferSize = 8192;