Changeset 30850 in webkit for trunk/JavaScriptCore/wtf

Timestamp:

Mar 6, 2008, 11:34:31 AM (17 years ago)

Author:

[email protected]

Message:

Wx build fix.

• wtf/unicode/icu/CollatorICU.cpp: (WTF::Collator::userDefault): Put ICU workaround under both PLATFORM(DARWIN) and PLATFORM(CF) checks, so that each port can decide if it wants to use CF on Mac for it.

File:

• trunk/JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp (modified) (1 diff)

trunk/JavaScriptCore/wtf/unicode/icu/CollatorICU.cpp

@@ -58 +58 @@
 std::auto_ptr<Collator> Collator::userDefault()
 {
-#if PLATFORM(DARWIN)
+#if PLATFORM(DARWIN) && PLATFORM(CF)
     // Mac OS X doesn't set UNIX locale to match user-selected one, so ICU default doesn't work.
     CFStringRef collationOrder = (CFStringRef)CFPreferencesCopyValue(CFSTR("AppleCollationOrder"), kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);