From 9b8a752249c69ba94461b3ef6d919c1b86ae6fab Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Tue, 18 Feb 2014 20:13:57 -0800 Subject: [PATCH] test: Quell warning for deprecated g_type_init() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The g_type_init() routine was deprecated in glib 2.34. Tested and verified this conditionalization on glib 2.32 and 2.36. No need to change version dependencies. test/any2ppm.c:864:5: warning: ‘g_type_init’ is deprecated (declared at /usr/include/glib-2.0/gobject/gtype.h:669) Reviewed-by: Chris Wilson --- test/any2ppm.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/any2ppm.c b/test/any2ppm.c index af2a43edf..b125496e8 100644 --- a/test/any2ppm.c +++ b/test/any2ppm.c @@ -863,8 +863,10 @@ main (int argc, char **argv) const char *err; #if CAIRO_CAN_TEST_PDF_SURFACE || CAIRO_CAN_TEST_SVG_SURFACE +#if GLIB_MAJOR_VERSION <= 2 && GLIB_MINOR_VERSION <= 34 g_type_init (); #endif +#endif #if CAIRO_CAN_TEST_SVG_SURFACE rsvg_set_default_dpi (72.0);