Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(461)

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

Issue 14107015: Rename OS(DARWIN) to OS(MACOSX). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 years, 3 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:
View side-by-side diff with in-line comments
Download patch
Index: Source/wtf/unicode/icu/CollatorICU.cpp
diff --git a/Source/wtf/unicode/icu/CollatorICU.cpp b/Source/wtf/unicode/icu/CollatorICU.cpp
index a005ee2412ba0f86a80a5c661e4befab61d29b31..a21e9325a5add6c86844373e4bb8b07ca1e06ffb 100644
--- a/Source/wtf/unicode/icu/CollatorICU.cpp
+++ b/Source/wtf/unicode/icu/CollatorICU.cpp
@@ -37,7 +37,7 @@
#include <string.h>
#include <unicode/ucol.h>
-#if OS(DARWIN)
+#if OS(MACOSX)
#include "wtf/RetainPtr.h"
#include <CoreFoundation/CoreFoundation.h>
#endif
@@ -60,7 +60,7 @@ Collator::Collator(const char* locale)
PassOwnPtr<Collator> Collator::userDefault()
{
-#if OS(DARWIN) && USE(CF)
+#if OS(MACOSX) && USE(CF)
// Mac OS X doesn't set UNIX locale to match user-selected one, so ICU default doesn't work.
RetainPtr<CFLocaleRef> currentLocale(AdoptCF, CFLocaleCopyCurrent());
CFStringRef collationOrder = (CFStringRef)CFLocaleGetValue(currentLocale.get(), kCFLocaleCollatorIdentifier);

Powered by Google App Engine
This is Rietveld 408576698