From 47ada3e562521ce290efa9fa8e5aaebaaa62d986 Mon Sep 17 00:00:00 2001
From: "jaggernaut%netscape.com"
 <jaggernaut%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 20 Jul 2003 11:54:31 +0000
Subject: [PATCH] Gotta love macros

git-svn-id: svn://10.0.0.236/trunk@144999 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp      | 2 ++
 mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp        | 2 ++
 mozilla/modules/plugin/base/src/nsPluginNativeWindowOS2.cpp | 2 ++
 mozilla/modules/plugin/base/src/nsPluginNativeWindowWin.cpp | 1 +
 4 files changed, 7 insertions(+)

diff --git a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
index bbd04de13c0..f7e3229ed83 100644
--- a/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
+++ b/mozilla/modules/plugin/base/src/ns4xPluginInstance.cpp
@@ -69,6 +69,8 @@
 
 ////////////////////////////////////////////////////////////////////////
 // CID's && IID's
+static NS_DEFINE_IID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); // needed for NS
+_TRY_SAFE_CALL
 static NS_DEFINE_IID(kIPluginStreamListenerIID, NS_IPLUGINSTREAMLISTENER_IID);
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index 92be398f881..ee96d9a45d0 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -209,6 +209,8 @@ static const char kDirectoryServiceContractID[] = "@mozilla.org/file/directory_s
 static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
 static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
 static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
+static NS_DEFINE_CID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); // needed for NS
+_TRY_SAFE_CALL
 
 ////////////////////////////////////////////////////////////////////////
 // Registry keys for caching plugin info
diff --git a/mozilla/modules/plugin/base/src/nsPluginNativeWindowOS2.cpp b/mozilla/modules/plugin/base/src/nsPluginNativeWindowOS2.cpp
index 4687122a139..4bb950497b5 100644
--- a/mozilla/modules/plugin/base/src/nsPluginNativeWindowOS2.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginNativeWindowOS2.cpp
@@ -50,6 +50,8 @@
 #include "nsPluginNativeWindow.h"
 
 static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
+static NS_DEFINE_CID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); // needed for NS
+_TRY_SAFE_CALL
 
 #define NS_PLUGIN_WINDOW_PROPERTY_ASSOCIATION "MozillaPluginWindowPropertyAssociation"
 
diff --git a/mozilla/modules/plugin/base/src/nsPluginNativeWindowWin.cpp b/mozilla/modules/plugin/base/src/nsPluginNativeWindowWin.cpp
index b05d5b92319..87777ff567a 100644
--- a/mozilla/modules/plugin/base/src/nsPluginNativeWindowWin.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginNativeWindowWin.cpp
@@ -51,6 +51,7 @@
 #include "nsPluginNativeWindow.h"
 
 static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
+static NS_DEFINE_CID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); // needed for NS_TRY_SAFE_CALL
 
 #define NS_PLUGIN_WINDOW_PROPERTY_ASSOCIATION "MozillaPluginWindowPropertyAssociation"