Title: [122669] trunk/Source/WTF
- Revision
- 122669
- Author
- [email protected]
- Date
- 2012-07-14 12:28:40 -0700 (Sat, 14 Jul 2012)
Log Message
Unreviewed, build fix.
* wtf/Assertions.cpp:
* wtf/Platform.h:
* wtf/unicode/icu/CollatorICU.cpp:
(WTF::Collator::userDefault):
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (122668 => 122669)
--- trunk/Source/WTF/ChangeLog 2012-07-14 14:09:28 UTC (rev 122668)
+++ trunk/Source/WTF/ChangeLog 2012-07-14 19:28:40 UTC (rev 122669)
@@ -1,3 +1,12 @@
+2012-07-14 Filip Pizlo <[email protected]>
+
+ Unreviewed, build fix.
+
+ * wtf/Assertions.cpp:
+ * wtf/Platform.h:
+ * wtf/unicode/icu/CollatorICU.cpp:
+ (WTF::Collator::userDefault):
+
2012-07-13 Xianzhu Wang <[email protected]>
Move WebCore/platform/text/Base64 to WTF/wtf/text
Modified: trunk/Source/WTF/wtf/Assertions.cpp (122668 => 122669)
--- trunk/Source/WTF/wtf/Assertions.cpp 2012-07-14 14:09:28 UTC (rev 122668)
+++ trunk/Source/WTF/wtf/Assertions.cpp 2012-07-14 19:28:40 UTC (rev 122669)
@@ -88,7 +88,7 @@
CFStringGetCString(str, buffer, length, kCFStringEncodingUTF8);
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
asl_log(0, 0, ASL_LEVEL_NOTICE, "%s", buffer);
#endif
fputs(buffer, stderr);
@@ -99,7 +99,7 @@
return;
}
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
va_list copyOfArgs;
va_copy(copyOfArgs, args);
asl_vlog(0, 0, ASL_LEVEL_NOTICE, format, copyOfArgs);
Modified: trunk/Source/WTF/wtf/Platform.h (122668 => 122669)
--- trunk/Source/WTF/wtf/Platform.h 2012-07-14 14:09:28 UTC (rev 122668)
+++ trunk/Source/WTF/wtf/Platform.h 2012-07-14 19:28:40 UTC (rev 122669)
@@ -702,7 +702,7 @@
#define HAVE_SYS_TIMEB_H 1
#define WTF_USE_ACCELERATE 1
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
+#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
#define HAVE_DISPATCH_H 1
#define HAVE_HOSTED_CORE_ANIMATION 1
@@ -1038,7 +1038,7 @@
#define ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH 1
#endif
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
#define ENABLE_THREADED_SCROLLING 1
#endif
@@ -1100,11 +1100,11 @@
#define ENABLE_GC_VALIDATION 1
#endif
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
#define WTF_USE_AVFOUNDATION 1
#endif
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
+#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
#define WTF_USE_COREMEDIA 1
#endif
@@ -1116,7 +1116,7 @@
#define WTF_USE_REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR 1
#endif
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
+#if PLATFORM(MAC) && (PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070)
#define HAVE_INVERTED_WHEEL_EVENTS 1
#endif
Modified: trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp (122668 => 122669)
--- trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp 2012-07-14 14:09:28 UTC (rev 122668)
+++ trunk/Source/WTF/wtf/unicode/icu/CollatorICU.cpp 2012-07-14 19:28:40 UTC (rev 122669)
@@ -61,7 +61,7 @@
{
#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 && !OS(IOS)
+#if !OS(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
RetainPtr<CFLocaleRef> currentLocale(AdoptCF, CFLocaleCopyCurrent());
CFStringRef collationOrder = (CFStringRef)CFLocaleGetValue(currentLocale.get(), kCFLocaleCollatorIdentifier);
#else
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
