Merge tracemonkey to mozilla-central.

This commit is contained in:
Robert Sayre
2009-03-20 00:04:47 -04:00
7 changed files with 445 additions and 54 deletions

View File

@@ -1690,7 +1690,7 @@ js_HasOwnProperty(JSContext *cx, JSLookupPropOp lookup, JSObject *obj, jsid id,
}
#ifdef JS_TRACER
static int32 FASTCALL
static JSBool FASTCALL
Object_p_hasOwnProperty(JSContext* cx, JSObject* obj, JSString *str)
{
jsid id;
@@ -1736,7 +1736,7 @@ obj_propertyIsEnumerable(JSContext *cx, uintN argc, jsval *vp)
}
#ifdef JS_TRACER
static int32 FASTCALL
static JSBool FASTCALL
Object_p_propertyIsEnumerable(JSContext* cx, JSObject* obj, JSString *str)
{
jsid id = ATOM_TO_JSID(STRING_TO_JSVAL(str));