From 2eb4dac2a7eb754bb7c2835018a213f7e8e3dada Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Fri, 2 Dec 2005 20:27:52 +0000 Subject: [PATCH] Go back to not-unloading component DLLs because of balsa orange :-( git-svn-id: svn://10.0.0.236/trunk@185598 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/components/nsNativeComponentLoader.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mozilla/xpcom/components/nsNativeComponentLoader.cpp b/mozilla/xpcom/components/nsNativeComponentLoader.cpp index 9feb9353f4e..2ccf2326e56 100644 --- a/mozilla/xpcom/components/nsNativeComponentLoader.cpp +++ b/mozilla/xpcom/components/nsNativeComponentLoader.cpp @@ -215,10 +215,6 @@ PLDHashOperator nsNativeModuleLoader::UnloaderFunc(nsIHashable* aHashedFile, NativeLoadData& aLoadData, void*) { -#ifdef NS_BUILD_REFCNT_LOGGING - nsTraceRefcntImpl::SetActivityIsLegal(PR_FALSE); -#endif - if (PR_LOG_TEST(nsNativeModuleLoaderLog, PR_LOG_DEBUG)) { nsCOMPtr file(do_QueryInterface(aHashedFile)); @@ -229,8 +225,16 @@ nsNativeModuleLoader::UnloaderFunc(nsIHashable* aHashedFile, ("nsNativeModuleLoader::UnloaderFunc(\"%s\")", filePath.get())); } +#ifdef NS_BUILD_REFCNT_LOGGING + nsTraceRefcntImpl::SetActivityIsLegal(PR_FALSE); +#endif + +#if 0 + // XXXbsmedberg: do this as soon as the static-destructor crash(es) + // are fixed PRStatus ret = PR_UnloadLibrary(aLoadData.library); NS_ASSERTION(ret == PR_SUCCESS, "Failed to unload library"); +#endif #ifdef NS_BUILD_REFCNT_LOGGING nsTraceRefcntImpl::SetActivityIsLegal(PR_TRUE);