wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

More mismerging fixes.

Browse Source
This commit is contained in:
Jeff Walden 2010-03-27 00:04:10 -07:00
parent 7b7b7b4bd1
commit f76c672bfa
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/jsexn.cpp
View File

@ -839,9 +839,8 @@ exn_toSource(JSContext *cx, uintN argc, jsval *vp)
*vp = STRING_TO_JSVAL(name);
JSTempValueRooter tvr;
{
JSBool ok;
{
MUST_FLOW_THROUGH("out");
JS_PUSH_TEMP_ROOT(cx, 3, localroots, &tvr);
@ -953,7 +952,7 @@ exn_toSource(JSContext *cx, uintN argc, jsval *vp)
out:
JS_POP_TEMP_ROOT(cx, &tvr);
return JS_FALSE;
return JS_TRUE;
}
#endif