Source/wtf/unicode/icu/CollatorICU.cpp - Issue 14516007: Remove OS(IOS) and OS(MAC_OS_X) guards.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/wtf/unicode/icu/CollatorICU.cpp

Issue 14516007: Remove OS(IOS) and OS(MAC_OS_X) guards. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Source/wtf/unicode/icu/CollatorICU.cpp

diff --git a/Source/wtf/unicode/icu/CollatorICU.cpp b/Source/wtf/unicode/icu/CollatorICU.cpp

index fdb710d03a6114ddf3b358670edbabb3000f46bd..12b36b6072224aca94bff9470fa590ae6b85541c 100644

--- a/Source/wtf/unicode/icu/CollatorICU.cpp

+++ b/Source/wtf/unicode/icu/CollatorICU.cpp

@@ -62,7 +62,7 @@ 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 !OS(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060

+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060

RetainPtr<CFLocaleRef> currentLocale(AdoptCF, CFLocaleCopyCurrent());

CFStringRef collationOrder = (CFStringRef)CFLocaleGetValue(currentLocale.get(), kCFLocaleCollatorIdentifier);

#else

« no previous file with comments | « Source/wtf/ThreadingPthreads.cpp ('k') | Tools/DumpRenderTree/chromium/TestShell.cpp » ('j') | no next file with comments »