Fix for windows build bustage
authorBen Turner <bent.mozilla@gmail.com>
Thu, 19 Mar 2009 17:19:19 -0700
changeset 26403 0cc2b18364f0f7a8575fb806464fd83eea3fa3c7
parent 26402 93d93616dd8f388a808c9bfd6f6f7e21056c994d
child 26404 7420047c0e68b718b2faa0a28e199944bee24e48
push id6049
push userrsayre@mozilla.com
push dateFri, 20 Mar 2009 07:37:42 +0000
treeherdermozilla-central@19d25e2a170f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.2a1pre
Fix for windows build bustage
js/src/jsobj.cpp
js/src/jstracer.cpp
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -1685,17 +1685,17 @@ js_HasOwnProperty(JSContext *cx, JSLooku
         }
     }
     if (prop)
         OBJ_DROP_PROPERTY(cx, obj2, prop);
     return JS_TRUE;
 }
 
 #ifdef JS_TRACER
-static int32 FASTCALL
+static JSBool FASTCALL
 Object_p_hasOwnProperty(JSContext* cx, JSObject* obj, JSString *str)
 {
     jsid id;
     jsval v;
 
     if (!js_ValueToStringId(cx, STRING_TO_JSVAL(str), &id) ||
         !js_HasOwnProperty(cx, obj->map->ops->lookupProperty, obj, id, &v)) {
         cx->builtinStatus |= JSBUILTIN_ERROR;
@@ -1731,17 +1731,17 @@ obj_propertyIsEnumerable(JSContext *cx, 
     if (!JS_ValueToId(cx, argc != 0 ? vp[2] : JSVAL_VOID, &id))
         return JS_FALSE;
 
     obj = JS_THIS_OBJECT(cx, vp);
     return obj && js_PropertyIsEnumerable(cx, obj, id, 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));
     jsval v;
 
     if (!js_PropertyIsEnumerable(cx, obj, id, &v)) {
         cx->builtinStatus |= JSBUILTIN_ERROR;
         return JSVAL_TO_BOOLEAN(JSVAL_VOID);
--- a/js/src/jstracer.cpp
+++ b/js/src/jstracer.cpp
@@ -7219,17 +7219,17 @@ SetProperty(JSContext *cx, uintN argc, j
         return JS_FALSE;
     argv[0] = ID_TO_VALUE(id);
     if (!OBJ_SET_PROPERTY(cx, JS_THIS_OBJECT(cx, vp), id, &argv[1]))
         return JS_FALSE;
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
     return JS_TRUE;
 }
 
-static int32 FASTCALL
+static JSBool FASTCALL
 SetProperty_tn(JSContext* cx, JSObject* obj, JSString* idstr, jsval v)
 {
     JSAutoTempValueRooter tvr(cx, v);
     JSAutoTempIdRooter idr(cx);
 
     if (!js_ValueToStringId(cx, STRING_TO_JSVAL(idstr), idr.addr()) ||
         !OBJ_SET_PROPERTY(cx, obj, idr.id(), tvr.addr())) {
         cx->builtinStatus |= JSBUILTIN_ERROR;
@@ -7250,17 +7250,17 @@ SetElement(JSContext *cx, uintN argc, js
         return JS_FALSE;
     argv[0] = ID_TO_VALUE(id);
     if (!OBJ_SET_PROPERTY(cx, JS_THIS_OBJECT(cx, vp), id, &argv[1]))
         return JS_FALSE;
     JS_SET_RVAL(cx, vp, JSVAL_VOID);
     return JS_TRUE;
 }
 
-static int32 FASTCALL
+static JSBool FASTCALL
 SetElement_tn(JSContext* cx, JSObject* obj, int32 index, jsval v)
 {
     JSAutoTempIdRooter idr(cx);
     JSAutoTempValueRooter tvr(cx, v);
 
     if (!js_Int32ToId(cx, index, idr.addr()) ||
         !OBJ_SET_PROPERTY(cx, obj, idr.id(), tvr.addr())) {
         cx->builtinStatus |= JSBUILTIN_ERROR;