diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-05-12 16:19:33 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-05-12 16:19:58 +0200 |
| commit | 6571d2ceb42930dab01677ef0e95e732d5076fb8 (patch) | |
| tree | 8c593b8e09f2cfb457df72d40dc719bb0e0df066 /dom/plugins/base | |
| parent | 2f359ed80ccb2cab440c0cda886404ed42ad9fdf (diff) | |
| download | UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar.gz UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar.lz UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.tar.xz UXP-6571d2ceb42930dab01677ef0e95e732d5076fb8.zip | |
Remove MOZ_WIDGET_GONK [1/2]
Tag #288
Diffstat (limited to 'dom/plugins/base')
| -rw-r--r-- | dom/plugins/base/PluginPRLibrary.cpp | 6 | ||||
| -rw-r--r-- | dom/plugins/base/PluginPRLibrary.h | 2 | ||||
| -rw-r--r-- | dom/plugins/base/nsNPAPIPlugin.cpp | 1 |
3 files changed, 1 insertions, 8 deletions
diff --git a/dom/plugins/base/PluginPRLibrary.cpp b/dom/plugins/base/PluginPRLibrary.cpp index a7ad76ea4..ecc55d455 100644 --- a/dom/plugins/base/PluginPRLibrary.cpp +++ b/dom/plugins/base/PluginPRLibrary.cpp @@ -57,12 +57,6 @@ PluginPRLibrary::NP_Initialize(NPNetscapeFuncs* bFuncs, mNPP_GetSitesWithData = pFuncs->getsiteswithdata; return NS_OK; } -#elif defined(MOZ_WIDGET_GONK) -nsresult -PluginPRLibrary::NP_Initialize(NPNetscapeFuncs* bFuncs, NPError* error) -{ - return NS_OK; -} #elif defined(XP_UNIX) && !defined(XP_MACOSX) nsresult PluginPRLibrary::NP_Initialize(NPNetscapeFuncs* bFuncs, diff --git a/dom/plugins/base/PluginPRLibrary.h b/dom/plugins/base/PluginPRLibrary.h index 602ad8cf8..ffd3de934 100644 --- a/dom/plugins/base/PluginPRLibrary.h +++ b/dom/plugins/base/PluginPRLibrary.h @@ -81,7 +81,7 @@ public: return true; } -#if defined(XP_UNIX) && !defined(XP_MACOSX) && !defined(MOZ_WIDGET_GONK) +#if defined(XP_UNIX) && !defined(XP_MACOSX) virtual nsresult NP_Initialize(NPNetscapeFuncs* aNetscapeFuncs, NPPluginFuncs* aFuncs, NPError* aError) override; #else diff --git a/dom/plugins/base/nsNPAPIPlugin.cpp b/dom/plugins/base/nsNPAPIPlugin.cpp index 1bea269cd..697bfacd4 100644 --- a/dom/plugins/base/nsNPAPIPlugin.cpp +++ b/dom/plugins/base/nsNPAPIPlugin.cpp @@ -320,7 +320,6 @@ nsNPAPIPlugin::CreatePlugin(nsPluginTag *aPluginTag, nsNPAPIPlugin** aResult) if (rv != NS_OK || pluginCallError != NPERR_NO_ERROR) { return NS_ERROR_FAILURE; } -#elif defined(MOZ_WIDGET_GONK) #else NPError pluginCallError; nsresult rv = pluginLib->NP_Initialize(&sBrowserFuncs, &plugin->mPluginFuncs, &pluginCallError); |