From 04fe60d2000d30edd0d3d5d75f82c107b98cdb80 Mon Sep 17 00:00:00 2001 From: "reed%reedloden.com" Date: Fri, 18 Jan 2008 09:09:18 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20412811=20-=20"xpconnect-tools=20build=20b?= =?UTF-8?q?roken"=20[p=3Darmin76@gentoo.org=20(Ra=C3=83=C2=BAl=20Porcel)?= =?UTF-8?q?=20r+sr=3Dbsmedberg=20(NPODB)]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://10.0.0.236/trunk@243428 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/src/xpconnect/sample/xpcsample1.cpp | 4 ++-- mozilla/js/src/xpconnect/tools/src/nsXPCToolsCompiler.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/js/src/xpconnect/sample/xpcsample1.cpp b/mozilla/js/src/xpconnect/sample/xpcsample1.cpp index 4ec1c77fc72..d0374047f79 100644 --- a/mozilla/js/src/xpconnect/sample/xpcsample1.cpp +++ b/mozilla/js/src/xpconnect/sample/xpcsample1.cpp @@ -244,8 +244,8 @@ nsXPCSample_HookerUpper::CreateSampleObjectAtGlobalScope(const char *name, PRInt return NS_ERROR_FAILURE; // get the xpconnect native call context - nsCOMPtr callContext; - xpc->GetCurrentNativeCallContext(getter_AddRefs(callContext)); + nsAXPCNativeCallContext *callContext = nsnull; + xpc->GetCurrentNativeCallContext(&callContext); if(!callContext) return NS_ERROR_FAILURE; diff --git a/mozilla/js/src/xpconnect/tools/src/nsXPCToolsCompiler.cpp b/mozilla/js/src/xpconnect/tools/src/nsXPCToolsCompiler.cpp index 824764d972a..1912a401bde 100644 --- a/mozilla/js/src/xpconnect/tools/src/nsXPCToolsCompiler.cpp +++ b/mozilla/js/src/xpconnect/tools/src/nsXPCToolsCompiler.cpp @@ -93,8 +93,8 @@ NS_IMETHODIMP nsXPCToolsCompiler::CompileFile(nsILocalFile *aFile, PRBool strict return NS_ERROR_FAILURE; // get the xpconnect native call context - nsCOMPtr callContext; - xpc->GetCurrentNativeCallContext(getter_AddRefs(callContext)); + nsAXPCNativeCallContext *callContext = nsnull; + xpc->GetCurrentNativeCallContext(&callContext); if(!callContext) return NS_ERROR_FAILURE;