From 9feda49ada768aa16e1957784a81f71302dd2de6 Mon Sep 17 00:00:00 2001 From: Martin Husemann Date: Tue, 28 Aug 2012 23:16:13 +0200 Subject: [PATCH] Bug 753046 - Add IPC support for BSDs, dom/plugins/ipc part. r=cjones --- dom/plugins/ipc/PluginModuleChild.cpp | 6 +++--- dom/plugins/ipc/PluginModuleChild.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp index c12644d479a4..4d002dae5049 100644 --- a/dom/plugins/ipc/PluginModuleChild.cpp +++ b/dom/plugins/ipc/PluginModuleChild.cpp @@ -197,7 +197,7 @@ PluginModuleChild::Init(const std::string& aPluginFilename, // TODO: use PluginPRLibrary here -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) mShutdownFunc = (NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown"); @@ -1828,7 +1828,7 @@ PluginModuleChild::AnswerNP_GetEntryPoints(NPError* _retval) PLUGIN_LOG_DEBUG_METHOD; AssertPluginThread(); -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) return true; #elif defined(OS_WIN) || defined(OS_MACOSX) *_retval = mGetEntryPointsFunc(&mFunctions); @@ -1857,7 +1857,7 @@ PluginModuleChild::AnswerNP_Initialize(const uint32_t& aFlags, NPError* _retval) SendBackUpXResources(FileDescriptor(xSocketFd)); #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) *_retval = mInitializeFunc(&sBrowserFuncs, &mFunctions); return true; #elif defined(OS_WIN) || defined(OS_MACOSX) diff --git a/dom/plugins/ipc/PluginModuleChild.h b/dom/plugins/ipc/PluginModuleChild.h index d0c8e18cc964..753aa5aef652 100644 --- a/dom/plugins/ipc/PluginModuleChild.h +++ b/dom/plugins/ipc/PluginModuleChild.h @@ -320,7 +320,7 @@ private: // we get this from the plugin NP_PLUGINSHUTDOWN mShutdownFunc; -#ifdef OS_LINUX +#if defined(OS_LINUX) || defined(OS_BSD) NP_PLUGINUNIXINIT mInitializeFunc; #elif defined(OS_WIN) || defined(OS_MACOSX) NP_PLUGININIT mInitializeFunc;