Changeset 169901 in webkit

Timestamp:

Jun 12, 2014, 10:33:05 AM (12 years ago)

Author:

Lucas Forschler

Message:

Merged r169900.

Location:

tags/Safari-538.40/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/Platform.h (modified) (1 diff)

tags/Safari-538.40/Source/WTF/ChangeLog

@@ +1 @@
+2014-06-12  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r169900
+
+    2014-06-12  Alexey Proskuryakov  <ap@apple.com>
+
+            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  <ossy@webkit.org>
 

tags/Safari-538.40/Source/WTF/wtf/Platform.h

@@ -1062 +1062 @@
 #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