fix new warnings resulting from my carpool

js/src/xpconnect/src/xpcprivate.h

@@ -230,21 +230,21 @@ struct NativeCallContextData
 {
     // no ctor or dtor so we have random state at creation.
 
-    void init(nsISupports*               callee,
-              uint16                     index,
-              nsIXPConnectWrappedNative* wrapper,
-              JSContext*                 cx,
-              PRUint32                   argc,
-              jsval*                     argv,
-              jsval*                     retvalp)
+    void init(nsISupports*               acallee,
+              uint16                     aindex,
+              nsIXPConnectWrappedNative* awrapper,
+              JSContext*                 acx,
+              PRUint32                   aargc,
+              jsval*                     aargv,
+              jsval*                     aretvalp)
     {
-        this->callee  = callee;
-        this->index   = index;
-        this->wrapper = wrapper;
-        this->cx      = cx;
-        this->argc    = argc;
-        this->argv    = argv;
-        this->retvalp = retvalp;
+        this->callee  = acallee;
+        this->index   = aindex;
+        this->wrapper = awrapper;
+        this->cx      = acx;
+        this->argc    = aargc;
+        this->argv    = aargv;
+        this->retvalp = aretvalp;
         this->threw   = JS_FALSE;
     }
 

js/src/xpconnect/src/xpcthrower.cpp

@@ -226,9 +226,9 @@ XPCJSThrower::ThrowExceptionObject(JSContext* cx, nsIXPCException* e)
             return JS_FALSE;
 
         // XXX funky
-        JSObject* obj = JS_GetGlobalObject(cx);
+        JSObject* glob = JS_GetGlobalObject(cx);
 
-        rv = xpc->WrapNative(cx, obj, e, NS_GET_IID(nsIXPCException), &wrapper);
+        rv = xpc->WrapNative(cx, glob, e, NS_GET_IID(nsIXPCException), &wrapper);
         NS_RELEASE(xpc);
         if(NS_SUCCEEDED(rv))
         {

js/src/xpconnect/src/xpcwrappednativeclass.cpp

@@ -271,7 +271,6 @@ nsXPCWrappedNativeClass::DestroyMemberDescriptors()
 {
     if(!mDescriptors)
         return;
-    JSRuntime* rt = mRuntime->GetJSRuntime();
     delete [] mDescriptors;
     mDescriptors = nsnull;
 }