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

Fix to get nsLeakDetector building again after shaver's changes to NS_NewGenericFactory(). r=dbaron@fas.harvard.edu, sr=waterson, amen=leaf.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@89669 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
beard%netscape.com 2001-03-15 02:49:23 +00:00
parent aa0b13b619
commit ad12fb26e3
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/xpcom/base/nsLeakDetector.cpp
View File

@ -169,23 +169,32 @@ nsresult NS_InitLeakDetector()
// open the first leak file.
rv = nextLeakFile();
if (rv != NS_OK)
if (NS_FAILED(rv))
return rv;
static nsModuleComponentInfo info = {
"Leak Detector", kCLeakDetectorCID, NS_CLEAKDETECTOR_CONTRACTID, nsLeakDetectorConstructor
};
// create a generic factory for the leak detector.
nsCOMPtr<nsIGenericFactory> factory;
rv = NS_NewGenericFactory(getter_AddRefs(factory), &nsLeakDetectorConstructor);
if (rv != NS_OK)
rv = NS_NewGenericFactory(getter_AddRefs(factory), &info);
if (NS_FAILED(rv))
return rv;
// register this factory with the component manager.
rv = nsComponentManager::RegisterFactory(kCLeakDetectorCID, "LeakDetector", NS_CLEAKDETECTOR_CONTRACTID, factory, PR_TRUE);
return rv;
return nsComponentManager::RegisterFactory(info.mCID, info.mDescription, info.mContractID, factory, PR_TRUE);
}
#ifdef XP_MAC
#define SHUTDOWN_LEAKS_EARLY
#undef SHUTDOWN_LEAKS_MEDIUM
#undef SHUTDOWN_LEAKS_LATE
#else
#undef SHUTDOWN_LEAKS_EARLY
#undef SHUTDOWN_LEAKS_MEDIUM
#define SHUTDOWN_LEAKS_LATE
#endif
class LeakDetectorFinalizer
{