From b7d38e048fb44f60e3a4d0f9d49fdd21259afc4a Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Sun, 18 Apr 2021 11:08:27 +0100 Subject: Use g_memdup2() with newer versions of GLib The g_memdup() function has been deprecated, as it takes the size of the memory area as an unsigned integer. The g_memdup2() replacement uses the more appropriate size_t type, instead. --- util/cairo-gobject/cairo-gobject-structs.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'util') diff --git a/util/cairo-gobject/cairo-gobject-structs.c b/util/cairo-gobject/cairo-gobject-structs.c index 4bbf11baa..95e4a44f4 100644 --- a/util/cairo-gobject/cairo-gobject-structs.c +++ b/util/cairo-gobject/cairo-gobject-structs.c @@ -71,12 +71,19 @@ CAIRO_DEFINE_BOXED ("CairoFontOptions", cairo_gobject_font_options, CAIRO_DEFINE_BOXED ("CairoRegion", cairo_gobject_region, cairo_region_reference, cairo_region_destroy); +#if GLIB_CHECK_VERSION(2, 68, 0) #define COPY_FUNC(name) \ static gpointer \ -cairo_gobject_cairo_ ## name ## _copy (gpointer src) \ -{ \ - return g_memdup (src, sizeof (cairo_ ## name ## _t)); \ +cairo_gobject_cairo_ ## name ## _copy (gpointer src) { \ + return g_memdup2 (src, sizeof (cairo_ ## name ## _t)); \ } +#else +#define COPY_FUNC(name) \ +static gpointer \ +cairo_gobject_cairo_ ## name ## _copy (gpointer src) { \ + return g_memdup (src, sizeof (cairo_ ## name ## _t)); \ +} +#endif COPY_FUNC (matrix) CAIRO_DEFINE_BOXED ("CairoMatrix", cairo_gobject_matrix, -- cgit v1.2.1