| Index: Source/wtf/unicode/icu/CollatorICU.cpp
|
| diff --git a/Source/wtf/unicode/icu/CollatorICU.cpp b/Source/wtf/unicode/icu/CollatorICU.cpp
|
| index 12b36b6072224aca94bff9470fa590ae6b85541c..ab950cdbcc8bdae844fb62f0f01e4f835de1e5d7 100644
|
| --- a/Source/wtf/unicode/icu/CollatorICU.cpp
|
| +++ b/Source/wtf/unicode/icu/CollatorICU.cpp
|
| @@ -62,13 +62,8 @@ PassOwnPtr<Collator> Collator::userDefault()
|
| {
|
| #if OS(DARWIN) && USE(CF)
|
| // Mac OS X doesn't set UNIX locale to match user-selected one, so ICU default doesn't work.
|
| -#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
|
| RetainPtr<CFLocaleRef> currentLocale(AdoptCF, CFLocaleCopyCurrent());
|
| CFStringRef collationOrder = (CFStringRef)CFLocaleGetValue(currentLocale.get(), kCFLocaleCollatorIdentifier);
|
| -#else
|
| - RetainPtr<CFStringRef> collationOrderRetainer(AdoptCF, (CFStringRef)CFPreferencesCopyValue(CFSTR("AppleCollationOrder"), kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesAnyHost));
|
| - CFStringRef collationOrder = collationOrderRetainer.get();
|
| -#endif
|
| char buf[256];
|
| if (!collationOrder)
|
| return adoptPtr(new Collator(""));
|
|
|