From 6d162b6454ee87b73059e7c6c3690a7e259a117c Mon Sep 17 00:00:00 2001 From: "locka%iol.ie" Date: Wed, 21 Jun 2000 12:48:11 +0000 Subject: [PATCH] Commented out both embedding hacks by default git-svn-id: svn://10.0.0.236/trunk@72757 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/embedding/base/nsEmbedAPI.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mozilla/embedding/base/nsEmbedAPI.cpp b/mozilla/embedding/base/nsEmbedAPI.cpp index 630a15bfa12..a02102f4c38 100644 --- a/mozilla/embedding/base/nsEmbedAPI.cpp +++ b/mozilla/embedding/base/nsEmbedAPI.cpp @@ -36,8 +36,8 @@ static nsIServiceManager *sServiceManager = nsnull; static PRBool sRegistryInitializedFlag = PR_FALSE; static PRUint32 sInitCounter = 0; -#define HACK_AROUND_THREADING_ISSUES -#define HACK_AROUND_NONREENTRANT_INITXPCOM +//#define HACK_AROUND_THREADING_ISSUES +//#define HACK_AROUND_NONREENTRANT_INITXPCOM #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM // XXX hack class to clean up XPCOM when this module is unloaded @@ -178,11 +178,12 @@ nsresult NS_TermEmbedding() nsServiceManager::ReleaseService(kEventQueueServiceCID, eventQService); } + NS_RELEASE(sServiceManager); + // Terminate XPCOM & cleanup #ifndef HACK_AROUND_NONREENTRANT_INITXPCOM NS_ShutdownXPCOM(sServiceManager); #endif - NS_RELEASE(sServiceManager); return NS_OK; }