diff --git a/src/wxxt/src/wx_cairo.h b/src/wxxt/src/wx_cairo.h
index b416ec1a8c..776b2a75fa 100644
--- a/src/wxxt/src/wx_cairo.h
+++ b/src/wxxt/src/wx_cairo.h
@@ -27,7 +27,7 @@ typedef cairo_matrix_t cairo_matrix_p;
 # else
   /* Old Cairo API (0.5 and up) */
 typedef cairo_matrix_t *cairo_matrix_p;
-#  define cairo_set_matrix_create(m) (m) = cairo_matrix_create();
+#  define cairo_set_matrix_create(m) { cairo_matrix_t *__m; __m = cairo_matrix_create(); m = __m; }
 #  define cairo__set_matrix(CAIRO_DEV, m) cairo_set_matrix(CAIRO_DEV, m)
 #  define cairo_set_create_xlib(dev, display, drawable, vis, w, h) \
           dev = cairo_create(); cairo_set_target_drawable(dev, wxAPP_DISPLAY, DRAWABLE)