Import of pkgsrc-2014Q1

This commit is contained in:
2014-04-17 16:38:45 +02:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions

View File

@@ -1,13 +1,13 @@
$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.h,v 1.3 2012/09/02 06:43:41 ryoon Exp $
$NetBSD: patch-mozilla_dom_plugins_ipc_PluginModuleChild.h,v 1.4 2013/11/12 20:50:51 ryoon Exp $
--- mozilla/dom/plugins/ipc/PluginModuleChild.h.orig 2012-08-25 00:31:04.000000000 +0000
--- mozilla/dom/plugins/ipc/PluginModuleChild.h.orig 2013-10-23 22:08:54.000000000 +0000
+++ mozilla/dom/plugins/ipc/PluginModuleChild.h
@@ -330,7 +330,7 @@ private:
@@ -328,7 +328,7 @@ private:
// we get this from the plugin
NP_PLUGINSHUTDOWN mShutdownFunc;
-#ifdef OS_LINUX
+#if defined(OS_LINUX) || defined(OS_BSD)
-#if defined(OS_LINUX) || defined(OS_BSD)
+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS)
NP_PLUGINUNIXINIT mInitializeFunc;
#elif defined(OS_WIN) || defined(OS_MACOSX)
NP_PLUGININIT mInitializeFunc;