diff options
| author | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
| commit | 0703404654d2a40cacae2d94c6e0e22ca28b4acf (patch) | |
| tree | bfdbe1e8952814f73a6b0e190ae0a77fd0cfc7bd /javascript/jsapi.h | |
| parent | 54f719aa960159c5b1978846223732c9669ca7fa (diff) | |
| parent | 89856f55929907642013e45435b9d18cd1fafe36 (diff) | |
| download | netsurf-0703404654d2a40cacae2d94c6e0e22ca28b4acf.tar.gz netsurf-0703404654d2a40cacae2d94c6e0e22ca28b4acf.tar.bz2 | |
Merge branch 'master' into mono/removing-windom-dependencymono/removing-windom-dependency
Conflicts:
atari/toolbar.c
Diffstat (limited to 'javascript/jsapi.h')
| -rw-r--r-- | javascript/jsapi.h | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/javascript/jsapi.h b/javascript/jsapi.h index e3295fee9..e38188ab4 100644 --- a/javascript/jsapi.h +++ b/javascript/jsapi.h @@ -75,10 +75,9 @@ /* native proprty definition */ -#define JSAPI_PROP_GETTER(name, cx, obj, vp) \ - jsapi_property_##name##_get(cx, obj, jsval jsapi_id, vp) -#define JSAPI_PROP_SETTER(name, cx, obj, vp) \ - jsapi_property_##name##_set(cx, obj, jsval jsapi_id, vp) +#define JSAPI_PROP(name, cx, obj, vp) \ + jsapi_property_##name(cx, obj, jsval jsapi_id, vp) +#define JSAPI_STRICTPROP JSAPI_PROP /* native property return value */ #define JSAPI_PROP_RVAL(cx, vp) (*(vp)) @@ -193,12 +192,10 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx, - /* proprty native calls */ -#define JSAPI_PROP_GETTER(name, cx, obj, vp) \ - jsapi_property_##name##_get(cx, obj, jsval jsapi_id, vp) -#define JSAPI_PROP_SETTER(name, cx, obj, vp) \ - jsapi_property_##name##_set(cx, obj, jsval jsapi_id, vp) +#define JSAPI_PROP(name, cx, obj, vp) \ + jsapi_property_##name(cx, obj, jsval jsapi_id, vp) +#define JSAPI_STRICTPROP JSAPI_PROP /* native property return value */ #define JSAPI_PROP_RVAL JS_RVAL @@ -307,10 +304,10 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx, #define JSAPI_THIS_OBJECT(cx,vp) JS_THIS_OBJECT(cx,vp) /* proprty native calls */ -#define JSAPI_PROP_GETTER(name, cx, obj, vp) \ - jsapi_property_##name##_get(cx, obj, jsid jsapi_id, vp) -#define JSAPI_PROP_SETTER(name, cx, obj, vp) \ - jsapi_property_##name##_set(cx, obj, jsid jsapi_id, JSBool strict, vp) +#define JSAPI_PROP(name, cx, obj, vp) \ + jsapi_property_##name(cx, obj, jsid jsapi_id, vp) +#define JSAPI_STRICTPROP(name, cx, obj, vp) \ + jsapi_property_##name(cx, obj, jsid jsapi_id, JSBool strict, vp) /* native property return value */ #define JSAPI_PROP_RVAL JS_RVAL @@ -379,5 +376,10 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx, #endif #define JSLOG(args...) LOG((args)) +#ifdef ENABLE_VERBOSE_JS_DEBUG +#define JSDBG(args...) LOG((args)) +#else +#define JSDBG(args...) +#endif #endif |