--- a/js/src/jsdbg.cpp
+++ b/js/src/jsdbg.cpp
@@ -1284,17 +1284,17 @@ EvaluateInScope(JSContext *cx, JSObject 
 }
 
 enum EvalBindingsMode { WithoutBindings, WithBindings };
 
 static JSBool
 DebugFrameEval(JSContext *cx, uintN argc, Value *vp, EvalBindingsMode mode)
 {
     REQUIRE_ARGC(mode == WithBindings ? "Debug.Frame.evalWithBindings" : "Debug.Frame.eval",
-                 mode == WithBindings ? 2 : 1);
+                 uintN(mode == WithBindings ? 2 : 1));
     THIS_FRAME(cx, vp, mode == WithBindings ? "evalWithBindings" : "eval", thisobj, fp);
     Debug *dbg = Debug::fromChildJSObject(&vp[1].toObject());
 
     // Check the first argument, the eval code string.
     if (!vp[2].isString()) {
         JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_NOT_EXPECTED_TYPE,
                              "Debug.Frame.eval", "string", InformalValueTypeName(vp[2]));
         return false;

--- a/js/src/jsdbg.h
+++ b/js/src/jsdbg.h
@@ -49,17 +49,17 @@
 #include "jsweakmap.h"
 #include "jswrapper.h"
 #include "jsvalue.h"
 #include "vm/GlobalObject.h"
 
 namespace js {
 
 class Debug {
-    friend JSBool ::JS_DefineDebugObject(JSContext *cx, JSObject *obj);
+    friend JSBool (::JS_DefineDebugObject)(JSContext *cx, JSObject *obj);
 
   private:
     JSCList link;                       // See JSRuntime::debuggerList.
     JSObject *object;                   // The Debug object. Strong reference.
     GlobalObjectSet debuggees;          // Debuggee globals. Cross-compartment weak references.
     JSObject *hooksObject;              // See Debug.prototype.hooks. Strong reference.
     JSObject *uncaughtExceptionHook;    // Strong reference.
     bool enabled;