corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve atom/str naming conflicts in the source for narcissus, make narcissus extensions compile again (462436, r=brendan).

Browse Source
This commit is contained in:
Andreas Gal
2008-10-30 15:38:10 -07:00
parent 0e0f649320
commit 0adc66c64c
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jsobj.cpp
View File

@@ -4621,7 +4621,7 @@ js_Call(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
callee = JSVAL_TO_OBJECT(argv[-2]);
if (!OBJ_GET_PROPERTY(cx, callee,
ATOM_TO_JSID(cx->runtime->atomState.callAtom),
ATOM_TO_JSID(cx->runtime->atomState.__call__Atom),
&fval)) {
return JS_FALSE;
}
@@ -4664,7 +4664,7 @@ js_Construct(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
callee = JSVAL_TO_OBJECT(argv[-2]);
if (!OBJ_GET_PROPERTY(cx, callee,
ATOM_TO_JSID(cx->runtime->atomState
.constructAtom),
.__construct__Atom),
&cval)) {
return JS_FALSE;
}
@@ -4704,7 +4704,7 @@ js_HasInstance(JSContext *cx, JSObject *obj, jsval v, JSBool *bp)
if (!OBJ_GET_PROPERTY(cx, obj,
ATOM_TO_JSID(cx->runtime->atomState
.hasInstanceAtom),
.__hasInstance__Atom),
&fval)) {
return JS_FALSE;
}