mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use the correct version macro 

svn path=/trunk/netsurf/; revision=13966
This commit is contained in:
Vincent Sanders 2012-06-16 12:06:47 +00:00
parent a5f2a8cfba
commit 9dc376bdec
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
javascript/js.c
View File

@ -29,6 +29,11 @@ static JSRuntime *rt; /* global runtime */
void js_initialise(void)
{
/* Create a JS runtime. */
#if JS_VERSION >= 180
JS_SetCStringsAreUTF8(); /* we prefer our runtime to be utf-8 */
#endif
rt = JS_NewRuntime(8L * 1024L * 1024L);
LOG(("New runtime handle %p", rt));
}
@ -85,13 +90,23 @@ void js_destroycontext(jscontext *ctx)
/* The class of the global object. */
static JSClass global_class = {
"global", JSCLASS_GLOBAL_FLAGS,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
JSCLASS_NO_OPTIONAL_MEMBERS
"global",
JSCLASS_GLOBAL_FLAGS,
JS_PropertyStub,
JS_PropertyStub,
JS_PropertyStub,
#if JS_VERSION <= 180
JS_PropertyStub,
#else
JS_StrictPropertyStub,
#endif
JS_EnumerateStub,
JS_ResolveStub,
JS_ConvertStub,
JS_FinalizeStub,
JSCLASS_NO_OPTIONAL_MEMBERS
};
jsobject *js_newcompartment(jscontext *ctx, struct content* c)
{
JSContext *cx = (JSContext *)ctx;
@ -100,17 +115,18 @@ jsobject *js_newcompartment(jscontext *ctx, struct content* c)
if (cx == NULL) {
return NULL;
}
#ifdef SPIDERMONKEY_400
global = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL);
if (global == NULL) {
return NULL;
}
#else
#if JS_VERSION <= 180
global = JS_NewObject(cx, &global_class, NULL, NULL);
if (global == NULL) {
return NULL;
}
JS_SetGlobalObject(cx, global);
#else
global = JS_NewCompartmentAndGlobalObject(cx, &global_class, NULL);
if (global == NULL) {
return NULL;
}
#endif
JS_SetContextPrivate(cx, c); /* private pointer to content */