Title: [169901] tags/Safari-538.40/Source/WTF
Diff
Modified: tags/Safari-538.40/Source/WTF/ChangeLog (169900 => 169901)
--- tags/Safari-538.40/Source/WTF/ChangeLog 2014-06-12 16:35:38 UTC (rev 169900)
+++ tags/Safari-538.40/Source/WTF/ChangeLog 2014-06-12 17:33:05 UTC (rev 169901)
@@ -1,3 +1,19 @@
+2014-06-12 Lucas Forschler <[email protected]>
+
+ Merge r169900
+
+ 2014-06-12 Alexey Proskuryakov <[email protected]>
+
+ Fix Mac after r169880.
+
+ This revision added a C++ comment to Platform.h, which breaks sandbox profile
+ preprocessing.
+
+ Also, I do not believe that this comment was entirely accurate - we've always used
+ this technique with GCC, so there has to be more to it. So, I just removed the comment.
+
+ * wtf/Platform.h:
+
2014-06-11 Csaba Osztrogonác <[email protected]>
[EFL][GTK] Ultimate fix not to have build failures
Modified: tags/Safari-538.40/Source/WTF/wtf/Platform.h (169900 => 169901)
--- tags/Safari-538.40/Source/WTF/wtf/Platform.h 2014-06-12 16:35:38 UTC (rev 169900)
+++ tags/Safari-538.40/Source/WTF/wtf/Platform.h 2014-06-12 17:33:05 UTC (rev 169901)
@@ -1061,8 +1061,6 @@
#define ENABLE_OPENTYPE_MATH 1
#endif
-// There are many occurences of "#if TARGET_OS_IPHONE" guard which cause build failures if TARGET_OS_IPHONE isn't defined.
-// #if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE won't help, because GCC's preprocessor doesn't do short circuit macro evaluation.
#if PLATFORM(EFL) || PLATFORM(GTK)
#define TARGET_OS_IPHONE 0
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
