From 55603fe5e832f40cfddcc21ef7bc89628451b754 Mon Sep 17 00:00:00 2001
From: "beard%netscape.com"
 <beard%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 11 Apr 1999 00:01:18 +0000
Subject: [PATCH] renamed g_pNSIServiceManager to theServiceManager.

git-svn-id: svn://10.0.0.236/trunk@27071 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/oji/src/jvmmgr.cpp       | 4 ++--
 mozilla/modules/oji/src/nsJVMManager.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mozilla/modules/oji/src/jvmmgr.cpp b/mozilla/modules/oji/src/jvmmgr.cpp
index 7735b67a735..8b343751c57 100644
--- a/mozilla/modules/oji/src/jvmmgr.cpp
+++ b/mozilla/modules/oji/src/jvmmgr.cpp
@@ -31,7 +31,7 @@ static NS_DEFINE_IID(kIJVMConsoleIID, NS_IJVMCONSOLE_IID);
 static NS_DEFINE_IID(kIJVMPrefsWindowIID, NS_IJVMPREFSWINDOW_IID);
 static NS_DEFINE_IID(kISymantecDebuggerIID, NS_ISYMANTECDEBUGGER_IID);
 static NS_DEFINE_IID(kISecurityContextIID, NS_ISECURITYCONTEXT_IID);
-extern nsIServiceManager  *g_pNSIServiceManager;
+extern nsIServiceManager  *theServiceManager;
 
 PR_BEGIN_EXTERN_C
 
@@ -56,7 +56,7 @@ JVM_GetJVMMgr(void)
     return mgr;
 #else
     nsJVMManager* mgr = NULL;
-    nsresult err = g_pNSIServiceManager->GetService(kJVMManagerCID, kIJVMManagerIID, 
+    nsresult err = theServiceManager->GetService(kJVMManagerCID, kIJVMManagerIID, 
                                                 (nsISupports**)&mgr);
     if (err != NS_OK)
         return NULL;
diff --git a/mozilla/modules/oji/src/nsJVMManager.cpp b/mozilla/modules/oji/src/nsJVMManager.cpp
index 7c50ea95e06..260f57ca0e5 100644
--- a/mozilla/modules/oji/src/nsJVMManager.cpp
+++ b/mozilla/modules/oji/src/nsJVMManager.cpp
@@ -54,7 +54,7 @@ extern "C" int XP_JAVA_NO_CLASSES;
 extern "C" int XP_JAVA_GENERAL_FAILURE;
 extern "C" int XP_JAVA_STARTUP_FAILED;
 extern "C" int XP_JAVA_DEBUGGER_FAILED;
-extern nsIServiceManager  *g_pNSIServiceManager;
+extern nsIServiceManager  *theServiceManager;
 static NS_DEFINE_CID(kPluginManagerCID, NS_PLUGINMANAGER_CID);
 //static NS_DEFINE_CID(kPluginHostIID, NS_IPLUGINHOST_IID);
 static NS_DEFINE_IID(kPluginHostIID, NS_IPLUGINHOST_IID);
@@ -469,7 +469,7 @@ nsJVMManager::StartupJVM(void)
 
 	// beard:  Now uses the nsIPluginHost to load the plugin factory for NS_JVM_MIME_TYPE.
 	nsIPluginHost* pluginHost = NULL;
-    nsresult err = g_pNSIServiceManager->GetService(kPluginManagerCID, kPluginHostIID, (nsISupports**)&pluginHost);
+    nsresult err = theServiceManager->GetService(kPluginManagerCID, kPluginHostIID, (nsISupports**)&pluginHost);
 	if (err != NS_OK) {
         fStatus = nsJVMStatus_Failed;
         return fStatus;