Fix MSVC-only errors and a warning.

This commit is contained in:
Jason Orendorff 2011-06-16 10:25:10 -05:00
parent b9b63b7f8e
commit a212e74aed
2 changed files with 2 additions and 2 deletions

View File

@ -1291,7 +1291,7 @@ static JSBool
DebugFrameEval(JSContext *cx, uintN argc, Value *vp, EvalBindingsMode mode) DebugFrameEval(JSContext *cx, uintN argc, Value *vp, EvalBindingsMode mode)
{ {
REQUIRE_ARGC(mode == WithBindings ? "Debug.Frame.evalWithBindings" : "Debug.Frame.eval", 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); THIS_FRAME(cx, vp, mode == WithBindings ? "evalWithBindings" : "eval", thisobj, fp);
Debug *dbg = Debug::fromChildJSObject(&vp[1].toObject()); Debug *dbg = Debug::fromChildJSObject(&vp[1].toObject());

View File

@ -54,7 +54,7 @@
namespace js { namespace js {
class Debug { class Debug {
friend JSBool ::JS_DefineDebugObject(JSContext *cx, JSObject *obj); friend JSBool (::JS_DefineDebugObject)(JSContext *cx, JSObject *obj);
private: private:
JSCList link; // See JSRuntime::debuggerList. JSCList link; // See JSRuntime::debuggerList.