From a159a4a79b1facc77ae41983e9f96f8117f07f21 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@netsurf-browser.org>
Date: Tue, 20 Nov 2012 19:17:54 +0000
Subject: update JSAPI_PS() signature to cope with new nsgenbind

---
 javascript/jsapi.h | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/javascript/jsapi.h b/javascript/jsapi.h
index 8b7fe51eb..c10029159 100644
--- a/javascript/jsapi.h
+++ b/javascript/jsapi.h
@@ -82,12 +82,12 @@
 #define JS_SET_RVAL(cx, vp, v) (*(vp) = (v))
 
 /* native property specifier */
-#define JSAPI_PS(name, tinyid, flags) \
-	{ #name , tinyid , flags , jsapi_property_##name##_get , jsapi_property_##name##_set }
+#define JSAPI_PS(name, fnname, tinyid, flags)				\
+	{ name , tinyid , flags , jsapi_property_##fnname##_get , jsapi_property_##fnname##_set }
 
 /* native property specifier with no setter */
-#define JSAPI_PS_RO(name, tinyid, flags) \
-	{ #name , tinyid , flags | JSPROP_READONLY, jsapi_property_##name##_get , NULL }
+#define JSAPI_PS_RO(name, fnname, tinyid, flags)				\
+	{ name , tinyid , flags | JSPROP_READONLY, jsapi_property_##fnname##_get , NULL }
 
 /* native property specifier list end */
 #define JSAPI_PS_END { NULL, 0, 0, NULL, NULL }
@@ -187,11 +187,11 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx,
 	jsapi_property_##name##_set(cx, obj, jsval id, vp)
 
 /* property specifier */
-#define JSAPI_PS(name, tinyid, flags) \
-	{ #name , tinyid , flags , jsapi_property_##name##_get , jsapi_property_##name##_set }
+#define JSAPI_PS(name, fnname, tinyid, flags)				\
+	{ name , tinyid , flags , jsapi_property_##fnname##_get , jsapi_property_##fnname##_set }
 
-#define JSAPI_PS_RO(name, tinyid, flags) \
-	{ #name , tinyid , flags | JSPROP_READONLY, jsapi_property_##name##_get , NULL }
+#define JSAPI_PS_RO(name, fnname, tinyid, flags)				\
+	{ name , tinyid , flags | JSPROP_READONLY, jsapi_property_##fnname##_get , NULL }
 
 #define JSAPI_PS_END { NULL, 0, 0, NULL, NULL }
 
@@ -284,19 +284,19 @@ JS_NewCompartmentAndGlobalObject(JSContext *cx,
 	jsapi_property_##name##_set(cx, obj, jsid id, JSBool strict, vp)
 
 /* property specifier */
-#define JSAPI_PS(name, tinyid, flags) {				\
-		#name ,						\
-		tinyid ,					\
-		flags ,						\
-		jsapi_property_##name##_get ,			\
-		jsapi_property_##name##_set			\
+#define JSAPI_PS(name, fnname, tinyid, flags) {			\
+		name,						\
+		tinyid,						\
+		flags,						\
+		jsapi_property_##fnname##_get,			\
+		jsapi_property_##fnname##_set			\
 	}
 
-#define JSAPI_PS_RO(name, tinyid, flags) {			\
-		#name ,						\
-		tinyid ,					\
+#define JSAPI_PS_RO(name, fnname, tinyid, flags) {		\
+		name,						\
+		tinyid,						\
 		flags | JSPROP_READONLY,			\
-		jsapi_property_##name##_get ,			\
+		jsapi_property_##fnname##_get,			\
 		NULL						\
 	}
 
-- 
cgit v1.2.3