diff options
| author | Uli Schlachter <psychon@znc.in> | 2021-04-27 16:24:29 +0000 |
|---|---|---|
| committer | Uli Schlachter <psychon@znc.in> | 2021-04-27 16:24:29 +0000 |
| commit | 47770fc2b7df8d078ac6d421822e850927cddf7d (patch) | |
| tree | 4b4ce6c55039c2b524b40c1cd4d20f009cd4700b /util | |
| parent | 14385eeff3b9184c599614648b98458451b8db2b (diff) | |
| parent | 0bbb9de8069fca5685568b9cf475da45da9fc554 (diff) | |
| download | cairo-47770fc2b7df8d078ac6d421822e850927cddf7d.tar.gz | |
Merge branch 'ebassi/deprecations' into 'master'
Use g_memdup2() with newer versions of GLib
See merge request cairo/cairo!167
Diffstat (limited to 'util')
| -rw-r--r-- | util/cairo-gobject/cairo-gobject-structs.c | 13 |
1 files changed, 10 insertions, 3 deletions
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, |