Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-01 14:45:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix merge bustage.

Browse Source
This commit is contained in:
Robert Sayre 2010-04-12 10:08:55 -04:00
parent 114d145903
commit 98a3aefdbd
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jsobjinlines.h
View File

@ -45,6 +45,10 @@
#include "jsiter.h"
#include "jsscope.h"
#ifdef INCLUDE_MOZILLA_DTRACE
#include "jsdtracef.h"
#endif
#include "jsscopeinlines.h"
inline jsval

4
js/src/jstypedarray.cpp
View File

@ -121,7 +121,7 @@ ArrayBuffer::create(JSContext *cx, JSObject *obj,
uintN argc, jsval *argv, jsval *rval)
{
if (!obj) {
obj = js_NewObject(cx, &ArrayBuffer::jsclass, NULL, NULL);
obj = NewObject(cx, &ArrayBuffer::jsclass, NULL, NULL);
if (!obj)
return false;
*rval = OBJECT_TO_JSVAL(obj);
@ -708,7 +708,7 @@ class TypedArrayTemplate
create(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
{
if (!obj) {
obj = js_NewObject(cx, slowClass(), NULL, NULL);
obj = NewObject(cx, slowClass(), NULL, NULL);
if (!obj)
return false;
*rval = OBJECT_TO_JSVAL(obj);