diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
commit | 881da28418d380042aa95a97f0cbd42560a64f7c (patch) | |
tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.h | |
parent | 7e104c57a70fdf551bb3d22a5d637cdcbc69dbea (diff) | |
parent | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (diff) | |
download | qtwebkit-881da28418d380042aa95a97f0cbd42560a64f7c.tar.gz |
Merge 'wip/next' into dev
Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9
Diffstat (limited to 'Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.h')
-rw-r--r-- | Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.h b/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.h index 540c596aa..f79c1d26c 100644 --- a/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.h +++ b/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.h @@ -27,16 +27,14 @@ #ifndef PluginProcessMainUnix_h #define PluginProcessMainUnix_h -#include <WebKit2/WKBase.h> +#include <WebKit/WKBase.h> namespace WebKit { -#ifdef __cplusplus extern "C" { -WK_EXPORT int PluginProcessMainUnix(int argc, char* argv[]); -} // extern "C" -#endif // __cplusplus +WK_EXPORT int PluginProcessMainUnix(int argc, char** argv); +} } // namespace WebKit -#endif // PluginProcessMain_h +#endif // PluginProcessMainUnix_h |