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

OJI MozClassic to raptor merge

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@18465 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sudu%netscape.com
1999-01-25 08:05:00 +00:00
parent 1174d93a4d
commit d3239a027a
126 changed files with 8119 additions and 4096 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/xpcom/components/nsRepository.cpp
View File

@@ -46,6 +46,8 @@
#endif
#endif
#include "nsIServiceManager.h"
nsHashtable *nsRepository::factories = NULL;
PRMonitor *nsRepository::monitor = NULL;
@@ -251,7 +253,11 @@ nsresult nsRepository::loadFactory(FactoryEntry *aEntry,
nsFactoryProc proc = (nsFactoryProc) PR_FindSymbol(aEntry->instance,
"NSGetFactory");
if (proc != NULL) {
nsresult res = proc(aEntry->cid, aFactory);
nsIServiceManager* serviceMgr = NULL;
nsresult res = nsServiceManager::GetGlobalServiceManager(&serviceMgr);
if (res == NS_OK) {
res = proc(aEntry->cid, serviceMgr, aFactory);
}
return res;
}
PR_LOG(logmodule, PR_LOG_ERROR,