Bug 753046 - Add IPC support for BSDs, dom/plugins/ipc part. r=cjones

This commit is contained in:
Martin Husemann 2012-08-28 23:16:13 +02:00
Родитель 5f7b3202b0
Коммит 9feda49ada
2 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -197,7 +197,7 @@ PluginModuleChild::Init(const std::string& aPluginFilename,
// TODO: use PluginPRLibrary here // TODO: use PluginPRLibrary here
#if defined(OS_LINUX) #if defined(OS_LINUX) || defined(OS_BSD)
mShutdownFunc = mShutdownFunc =
(NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown"); (NP_PLUGINSHUTDOWN) PR_FindFunctionSymbol(mLibrary, "NP_Shutdown");
@ -1828,7 +1828,7 @@ PluginModuleChild::AnswerNP_GetEntryPoints(NPError* _retval)
PLUGIN_LOG_DEBUG_METHOD; PLUGIN_LOG_DEBUG_METHOD;
AssertPluginThread(); AssertPluginThread();
#if defined(OS_LINUX) #if defined(OS_LINUX) || defined(OS_BSD)
return true; return true;
#elif defined(OS_WIN) || defined(OS_MACOSX) #elif defined(OS_WIN) || defined(OS_MACOSX)
*_retval = mGetEntryPointsFunc(&mFunctions); *_retval = mGetEntryPointsFunc(&mFunctions);
@ -1857,7 +1857,7 @@ PluginModuleChild::AnswerNP_Initialize(const uint32_t& aFlags, NPError* _retval)
SendBackUpXResources(FileDescriptor(xSocketFd)); SendBackUpXResources(FileDescriptor(xSocketFd));
#endif #endif
#if defined(OS_LINUX) #if defined(OS_LINUX) || defined(OS_BSD)
*_retval = mInitializeFunc(&sBrowserFuncs, &mFunctions); *_retval = mInitializeFunc(&sBrowserFuncs, &mFunctions);
return true; return true;
#elif defined(OS_WIN) || defined(OS_MACOSX) #elif defined(OS_WIN) || defined(OS_MACOSX)

Просмотреть файл

@ -320,7 +320,7 @@ private:
// we get this from the plugin // we get this from the plugin
NP_PLUGINSHUTDOWN mShutdownFunc; NP_PLUGINSHUTDOWN mShutdownFunc;
#ifdef OS_LINUX #if defined(OS_LINUX) || defined(OS_BSD)
NP_PLUGINUNIXINIT mInitializeFunc; NP_PLUGINUNIXINIT mInitializeFunc;
#elif defined(OS_WIN) || defined(OS_MACOSX) #elif defined(OS_WIN) || defined(OS_MACOSX)
NP_PLUGININIT mInitializeFunc; NP_PLUGININIT mInitializeFunc;