Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed g_pNSIServiceManager to theServiceManager.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@27071 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
beard%netscape.com
1999-04-11 00:01:18 +00:00
parent 34eb24753a
commit 55603fe5e8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/modules/oji/src/jvmmgr.cpp
View File

@@ -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;

4
mozilla/modules/oji/src/nsJVMManager.cpp
View File

@@ -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;