Title: [164975] releases/WebKitGTK/webkit-2.4/Source/WebKit2
- Revision
- 164975
- Author
- [email protected]
- Date
- 2014-03-03 00:22:40 -0800 (Mon, 03 Mar 2014)
Log Message
Merge r164940 - [GTK] Make impossible to build with <webkit2/webkit2.h> and <webkit2/webkit-web-extension.h> included together
https://bugs.webkit.org/show_bug.cgi?id=129549
Reviewed by Martin Robinson.
Add a compile error to prevent mixing the UI and web process APIs.
* UIProcess/API/gtk/webkit2.h:
* WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (164974 => 164975)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-03-03 08:21:21 UTC (rev 164974)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-03-03 08:22:40 UTC (rev 164975)
@@ -1,5 +1,17 @@
2014-03-02 Carlos Garcia Campos <[email protected]>
+ [GTK] Make impossible to build with <webkit2/webkit2.h> and <webkit2/webkit-web-extension.h> included together
+ https://bugs.webkit.org/show_bug.cgi?id=129549
+
+ Reviewed by Martin Robinson.
+
+ Add a compile error to prevent mixing the UI and web process APIs.
+
+ * UIProcess/API/gtk/webkit2.h:
+ * WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h:
+
+2014-03-02 Carlos Garcia Campos <[email protected]>
+
[GTK] Remove the include dir of the C API from the WebKit2 pkg-config file
https://bugs.webkit.org/show_bug.cgi?id=129543
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/webkit2.h (164974 => 164975)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/webkit2.h 2014-03-03 08:21:21 UTC (rev 164974)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/UIProcess/API/gtk/webkit2.h 2014-03-03 08:22:40 UTC (rev 164975)
@@ -18,9 +18,13 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __WEBKIT2_H__
-#define __WEBKIT2_H__
+#ifdef __WEBKIT_WEB_EXTENSION_H__
+#error "Headers <webkit2/webkit2.h> and <webkit2/webkit-web-extension.h> cannot be included together."
+#endif
+#ifndef __WEBKIT_2_H__
+#define __WEBKIT_2_H__
+
#define __WEBKIT2_H_INSIDE__
#include <webkit2/WebKitAuthenticationRequest.h>
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h (164974 => 164975)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h 2014-03-03 08:21:21 UTC (rev 164974)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h 2014-03-03 08:22:40 UTC (rev 164975)
@@ -17,9 +17,13 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef __WebKitWebExtension_h
-#define __WebKitWebExtension_h
+#ifdef __WEBKIT_2_H__
+#error "Headers <webkit2/webkit2.h> and <webkit2/webkit-web-extension.h> cannot be included together."
+#endif
+#ifndef __WEBKIT_WEB_EXTENSION_H__
+#define __WEBKIT_WEB_EXTENSION_H__
+
#define __WEBKIT_WEB_EXTENSION_H_INSIDE__
#include <webkit2/WebKitFrame.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
