From 43a42f108af6bcbd91f2672731c3047c26213af1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 22 Oct 2012 15:40:17 +0200 Subject: Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 (http://svn.webkit.org/repository/webkit/trunk@132067) New snapshot that fixes build without QtWidgets --- Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp') diff --git a/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp b/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp index 4113d3dfa..e25f0674e 100644 --- a/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp +++ b/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp @@ -28,6 +28,8 @@ #include "config.h" #include "PluginProcessMainUnix.h" +#if ENABLE(PLUGIN_PROCESS) + #include "Logging.h" #include "NetscapePlugin.h" #include "PluginProcess.h" @@ -71,9 +73,9 @@ static int webkitXError(Display* xdisplay, XErrorEvent* error) WK_EXPORT int PluginProcessMainUnix(int argc, char* argv[]) { - ASSERT(argc == 2 || argc == 3); + ASSERT_UNUSED(argc, argc == 2 || argc == 3); bool scanPlugin = !strcmp(argv[1], "-scanPlugin"); - ASSERT(argc == 2 || (argc == 3 && scanPlugin)); + ASSERT_UNUSED(argc, argc == 2 || (argc == 3 && scanPlugin)); #if PLATFORM(GTK) gtk_init(&argc, &argv); @@ -111,3 +113,5 @@ WK_EXPORT int PluginProcessMainUnix(int argc, char* argv[]) } } // namespace WebKit + +#endif -- cgit v1.2.1