summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2013-01-22 18:58:22 +0000
committerVincent Sanders <vince@kyllikki.org>2013-01-22 18:58:22 +0000
commitfc6f04161e614521cff67f7bbaf70dbea0332f4d (patch)
tree0114126c0a861b90b94cd9102adc7d329c7ebc92
parent053976eb0fa4c7322c4a4448a2706bd96d1a1930 (diff)
downloadnetsurf-fc6f04161e614521cff67f7bbaf70dbea0332f4d.tar.gz
netsurf-fc6f04161e614521cff67f7bbaf70dbea0332f4d.tar.bz2
simplify jsapi property compatability macros
-rw-r--r--javascript/jsapi.h23
1 files changed, 7 insertions, 16 deletions
diff --git a/javascript/jsapi.h b/javascript/jsapi.h
index b26eb5572..b308ca531 100644
--- a/javascript/jsapi.h
+++ b/javascript/jsapi.h
@@ -75,12 +75,9 @@
/* native proprty definition */
-#define JSAPI_PROP_DEFAULT(name, cx, obj, vp) \
+#define JSAPI_PROP(name, cx, obj, vp) \
jsapi_property_##name(cx, obj, jsval jsapi_id, vp)
-#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_STRICTPROP JSAPI_PROP
/* native property return value */
#define JSAPI_PROP_RVAL(cx, vp) (*(vp))
@@ -195,14 +192,10 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx,
-
/* proprty native calls */
-#define JSAPI_PROP_DEFAULT(name, cx, obj, vp) \
+#define JSAPI_PROP(name, cx, obj, vp) \
jsapi_property_##name(cx, obj, jsval jsapi_id, vp)
-#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_STRICTPROP JSAPI_PROP
/* native property return value */
#define JSAPI_PROP_RVAL JS_RVAL
@@ -311,12 +304,10 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx,
#define JSAPI_THIS_OBJECT(cx,vp) JS_THIS_OBJECT(cx,vp)
/* proprty native calls */
-#define JSAPI_PROP_DEFAULT(name, cx, obj, vp) \
+#define JSAPI_PROP(name, cx, obj, vp) \
jsapi_property_##name(cx, obj, jsid jsapi_id, vp)
-#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_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