Merge TM -> JM

2011-04-01 19:57:28 -07:00
parent 1aa9a11b32 036698c466
commit 9c0a11d239
2008 changed files with 109330 additions and 74848 deletions
--- a/js/src/jsdate.cpp
+++ b/js/src/jsdate.cpp
@@ -2441,7 +2441,7 @@ date_toSource(JSContext *cx, uintN argc, Value *vp)
    }

    JSString *str = JS_NewStringCopyZ(cx, bytes);
-    js_free(bytes);
+    cx->free_(bytes);
    if (!str)
        return false;
    vp->setString(str);