Merge.

2008-07-06 11:19:06 -07:00
parent d94eda9c18 ad98697761
commit 8a97fd91ec
3 changed files with 5 additions and 2 deletions
--- a/js/src/jsbuiltins.cpp
+++ b/js/src/jsbuiltins.cpp
@@ -87,7 +87,7 @@ FASTCALL jsval builtin_BoxInt32(JSContext* cx, jsint i)
    return builtin_BoxDouble(cx, (jsdouble)i);
 } 

-FASTCALL jsint builtin_UnboxInt32(JSContext* cx, jsval v)
+FASTCALL jsint builtin_UnboxInt32(jsval v)
 {
    if (JS_LIKELY(JSVAL_IS_INT(v)))
        return JSVAL_TO_INT(v);