Title: [169880] trunk/Source
- Revision
- 169880
- Author
- [email protected]
- Date
- 2014-06-11 23:18:11 -0700 (Wed, 11 Jun 2014)
Log Message
[EFL][GTK] Ultimate fix not to have build failures
in the future because of "#if TARGET_OS_IPHONE" guards.
Unreviewed buildfix.
Source/WebKit2:
Revert the previous wrong fix attempt r169879.
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
* WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
Source/WTF:
* wtf/Platform.h: Define TARGET_OS_IPHONE to 0 on EFL and GTK.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (169879 => 169880)
--- trunk/Source/WTF/ChangeLog 2014-06-12 05:45:58 UTC (rev 169879)
+++ trunk/Source/WTF/ChangeLog 2014-06-12 06:18:11 UTC (rev 169880)
@@ -1,3 +1,12 @@
+2014-06-11 Csaba Osztrogonác <[email protected]>
+
+ [EFL][GTK] Ultimate fix not to have build failures
+ in the future because of "#if TARGET_OS_IPHONE" guards.
+
+ Unreviewed buildfix.
+
+ * wtf/Platform.h: Define TARGET_OS_IPHONE to 0 on EFL and GTK.
+
2014-06-11 Ryosuke Niwa <[email protected]>
Turning on DUMP_PROPERTYMAP_STATS causes a build failure
Modified: trunk/Source/WTF/wtf/Platform.h (169879 => 169880)
--- trunk/Source/WTF/wtf/Platform.h 2014-06-12 05:45:58 UTC (rev 169879)
+++ trunk/Source/WTF/wtf/Platform.h 2014-06-12 06:18:11 UTC (rev 169880)
@@ -1061,4 +1061,10 @@
#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
+
#endif /* WTF_Platform_h */
Modified: trunk/Source/WebKit2/ChangeLog (169879 => 169880)
--- trunk/Source/WebKit2/ChangeLog 2014-06-12 05:45:58 UTC (rev 169879)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-12 06:18:11 UTC (rev 169880)
@@ -1,3 +1,15 @@
+2014-06-11 Csaba Osztrogonác <[email protected]>
+
+ [EFL][GTK] Ultimate fix not to have build failures
+ in the future because of "#if TARGET_OS_IPHONE" guards.
+
+ Unreviewed buildfix.
+
+ Revert the previous wrong fix attempt r169879.
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
+
2014-06-11 Gyuyoung Kim <[email protected]>
Fix build break on EFL port since r169869
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (169879 => 169880)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2014-06-12 05:45:58 UTC (rev 169879)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2014-06-12 06:18:11 UTC (rev 169880)
@@ -566,7 +566,7 @@
return toImpl(pageRef)->usesEphemeralSession();
}
-#if defined(TARGET_OS_IPHONE)
+#if TARGET_OS_IPHONE
void WKBundlePageSetUseTestingViewportConfiguration(WKBundlePageRef pageRef, bool useTestingViewportConfiguration)
{
toImpl(pageRef)->setUseTestingViewportConfiguration(useTestingViewportConfiguration);
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h (169879 => 169880)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2014-06-12 05:45:58 UTC (rev 169879)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2014-06-12 06:18:11 UTC (rev 169880)
@@ -93,7 +93,7 @@
WK_EXPORT WKRenderingSuppressionToken WKBundlePageExtendIncrementalRenderingSuppression(WKBundlePageRef);
WK_EXPORT void WKBundlePageStopExtendingIncrementalRenderingSuppression(WKBundlePageRef, WKRenderingSuppressionToken);
-#if defined(TARGET_OS_IPHONE)
+#if TARGET_OS_IPHONE
WK_EXPORT void WKBundlePageSetUseTestingViewportConfiguration(WKBundlePageRef, bool);
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
