mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-28 09:13:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.netsurf-browser.org/netsurf

Browse Source
This commit is contained in:
Michael Drake 2013-05-22 22:06:30 +01:00
commit 8a13f530ea
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
javascript/jsapi.c
View File

@ -138,7 +138,7 @@ static JSBool heartbeat_callback(JSContext *cx)
return ret;
}
#if JS_VERSION >= 185
#if JS_VERSION >= 180
struct heartbeat {
JSContext *cx;
@ -259,7 +259,7 @@ static JSBool branch_callback(JSContext *cx, JSScript *script)
if (priv->branch_count == 0) {
priv->branch_count = priv->branch_reset; /* reset branch count */
ret = heartbeat(cx);
ret = heartbeat_callback(cx);
}
return ret;
}
@ -288,6 +288,8 @@ setup_heartbeat(JSContext *cx, int timeout, jscallback *cb, void *cbctx)
JS_SetContextPrivate(cx, priv);
JS_SetBranchCallback(cx, branch_callback);
return true;
}
static struct heartbeat *enable_heartbeat(JSContext *cx)