Bug 464788 - Fix warnings in XPConnect. r/sr=jst, a191=beltzner.

js/src/xpconnect/src/xpcruntimesvc.cpp

@@ -86,7 +86,6 @@ BackstagePass::NewResolve(nsIXPConnectWrappedNative *wrapper,
 NS_IMETHODIMP 
 BackstagePass::GetInterfaces(PRUint32 *aCount, nsIID * **aArray)
 {
-    nsresult rv = NS_OK;
     PRUint32 count = 1;
 #ifndef XPCONNECT_STANDALONE
     ++count;

js/src/xpconnect/src/xpcwrappednativeinfo.cpp

@@ -227,8 +227,8 @@ XPCNativeMember::Resolve(XPCCallContext& ccx, XPCNativeInterface* iface)
 
     AUTO_MARK_JSVAL(ccx, OBJECT_TO_JSVAL(funobj));
 
-    STOBJ_SET_PARENT(funobj, nsnull);
-    STOBJ_SET_PROTO(funobj, nsnull);
+    STOBJ_CLEAR_PARENT(funobj);
+    STOBJ_CLEAR_PROTO(funobj);
 
     if(!JS_SetReservedSlot(ccx, funobj, 0, PRIVATE_TO_JSVAL(iface))||
        !JS_SetReservedSlot(ccx, funobj, 1, PRIVATE_TO_JSVAL(this)))