9 files changed, 9 insertions, 17 deletions
diff --git a/modules/cairo-context.c b/modules/cairo-context.c
index bdb89acf..7b9575fa 100644
--- a/modules/cairo-context.c
+++ b/modules/cairo-context.c
@@ -274,8 +274,7 @@ _gjs_cairo_context_construct_internal(JSContext *context,
 
 GJS_NATIVE_CONSTRUCTOR_DECLARE(cairo_context)
 {
-    JSObject *object = NULL;                            \
-    jsval *argv = JS_ARGV(context, vp);
+    GJS_NATIVE_CONSTRUCTOR_VARIABLES(cairo_context)
     JSObject *surface_wrapper;
     cairo_surface_t *surface;
     cairo_t *cr;
diff --git a/modules/cairo-image-surface.c b/modules/cairo-image-surface.c
index 30b0df29..c2e587fc 100644
--- a/modules/cairo-image-surface.c
+++ b/modules/cairo-image-surface.c
@@ -31,8 +31,7 @@ GJS_DEFINE_PROTO("CairoImageSurface", cairo_image_surface)
 
 GJS_NATIVE_CONSTRUCTOR_DECLARE(cairo_image_surface)
 {
-    JSObject *object = NULL;                            \
-    jsval *argv = JS_ARGV(context, vp);
+    GJS_NATIVE_CONSTRUCTOR_VARIABLES(cairo_image_surface)
     int format, width, height;
     cairo_surface_t *surface;
 
diff --git a/modules/cairo-linear-gradient.c b/modules/cairo-linear-gradient.c
index 4132c960..74efc90c 100644
--- a/modules/cairo-linear-gradient.c
+++ b/modules/cairo-linear-gradient.c
@@ -31,8 +31,7 @@ GJS_DEFINE_PROTO("CairoLinearGradient", cairo_linear_gradient)
 
 GJS_NATIVE_CONSTRUCTOR_DECLARE(cairo_linear_gradient)
 {
-    JSObject *object = NULL;                            \
-    jsval *argv = JS_ARGV(context, vp);
+    GJS_NATIVE_CONSTRUCTOR_VARIABLES(cairo_linear_gradient)
     double x0, y0, x1, y1;
     cairo_pattern_t *pattern;
 
diff --git a/modules/cairo-pdf-surface.c b/modules/cairo-pdf-surface.c
index 144d53bf..6aca6134 100644
--- a/modules/cairo-pdf-surface.c
+++ b/modules/cairo-pdf-surface.c
@@ -34,8 +34,7 @@ GJS_DEFINE_PROTO("CairoPDFSurface", cairo_pdf_surface)
 
 GJS_NATIVE_CONSTRUCTOR_DECLARE(cairo_pdf_surface)
 {
-    JSObject *object = NULL;                            \
-    jsval *argv = JS_ARGV(context, vp);
+    GJS_NATIVE_CONSTRUCTOR_VARIABLES(cairo_pdf_surface)
     char *filename;
     double width, height;
     cairo_surface_t *surface;
diff --git a/modules/cairo-ps-surface.c b/modules/cairo-ps-surface.c
index 6e86c1a4..ca0fad45 100644
--- a/modules/cairo-ps-surface.c
+++ b/modules/cairo-ps-surface.c
@@ -34,8 +34,7 @@ GJS_DEFINE_PROTO("CairoPSSurface", cairo_ps_surface)
 
 GJS_NATIVE_CONSTRUCTOR_DECLARE(cairo_ps_surface)
 {
-    JSObject *object = NULL;                            \
-    jsval *argv = JS_ARGV(context, vp);
+    GJS_NATIVE_CONSTRUCTOR_VARIABLES(cairo_ps_surface)
     char *filename;
     double width, height;
     cairo_surface_t *surface;
diff --git a/modules/cairo-radial-gradient.c b/modules/cairo-radial-gradient.c
index 6b9a20c4..48f8b0b4 100644
--- a/modules/cairo-radial-gradient.c
+++ b/modules/cairo-radial-gradient.c
@@ -31,8 +31,7 @@ GJS_DEFINE_PROTO("CairoRadialGradient", cairo_radial_gradient)
 
 GJS_NATIVE_CONSTRUCTOR_DECLARE(cairo_radial_gradient)
 {
-    JSObject *object = NULL;                            \
-    jsval *argv = JS_ARGV(context, vp);
+    GJS_NATIVE_CONSTRUCTOR_VARIABLES(cairo_radial_gradient)
     double cx0, cy0, radius0, cx1, cy1, radius1;
     cairo_pattern_t *pattern;
 
diff --git a/modules/cairo-surface-pattern.c b/modules/cairo-surface-pattern.c
index 3f9cf3db..8791e320 100644
--- a/modules/cairo-surface-pattern.c
+++ b/modules/cairo-surface-pattern.c
@@ -31,8 +31,7 @@ GJS_DEFINE_PROTO("CairoSurfacePattern", cairo_surface_pattern)
 
 GJS_NATIVE_CONSTRUCTOR_DECLARE(cairo_surface_pattern)
 {
-    JSObject *object = NULL;                            \
-    jsval *argv = JS_ARGV(context, vp);
+    GJS_NATIVE_CONSTRUCTOR_VARIABLES(cairo_surface_pattern)
     JSObject *surface_wrapper;
     cairo_surface_t *surface;
     cairo_pattern_t *pattern;
diff --git a/modules/cairo-svg-surface.c b/modules/cairo-svg-surface.c
index 03880a4c..6acc26c5 100644
--- a/modules/cairo-svg-surface.c
+++ b/modules/cairo-svg-surface.c
@@ -34,8 +34,7 @@ GJS_DEFINE_PROTO("CairoSVGSurface", cairo_svg_surface)
 
 GJS_NATIVE_CONSTRUCTOR_DECLARE(cairo_svg_surface)
 {
-    JSObject *object = NULL;                            \
-    jsval *argv = JS_ARGV(context, vp);
+    GJS_NATIVE_CONSTRUCTOR_VARIABLES(cairo_svg_surface)
     char *filename;
     double width, height;
     cairo_surface_t *surface;
diff --git a/modules/dbus-exports.c b/modules/dbus-exports.c
index 3c1d8b40..d5c71987 100644
--- a/modules/dbus-exports.c
+++ b/modules/dbus-exports.c
@@ -1708,7 +1708,7 @@ exports_new_resolve(JSContext *context,
  */
 GJS_NATIVE_CONSTRUCTOR_DECLARE(js_exports)
 {
-    JSObject *object = NULL;                            \
+    GJS_NATIVE_CONSTRUCTOR_VARIABLES(js_exports)
     Exports *priv;
 
     GJS_NATIVE_CONSTRUCTOR_PRELUDE(js_exports);