From 446cedbcfc5fbfd43ef0e73731e657833636f4b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 27 Sep 2022 12:22:53 +0200 Subject: [PATCH] fpi-compat: Add definition for g_memdup2 when not available or deprecated It's suggested to use g_memdup2 everywhere, but since we've a max-glib version set we'd get a "deprecation" warning. Avoid it this by re-defininig it through a macro in both cases. --- libfprint/fpi-compat.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libfprint/fpi-compat.h b/libfprint/fpi-compat.h index 5480eb52..6582fb5a 100644 --- a/libfprint/fpi-compat.h +++ b/libfprint/fpi-compat.h @@ -39,6 +39,17 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (FpDeviceClass, g_type_class_unref); G_DEFINE_AUTOPTR_CLEANUP_FUNC (GDate, g_date_free); #endif +#if !GLIB_CHECK_VERSION (2, 68, 0) +#define g_memdup2(data, size) g_memdup ((data), (size)) +#else +#define g_memdup2(data, size) \ + (G_GNUC_EXTENSION ({ \ + G_GNUC_BEGIN_IGNORE_DEPRECATIONS \ + g_memdup2 ((data), (size)); \ + G_GNUC_END_IGNORE_DEPRECATIONS \ + })) +#endif + #if __GNUC__ > 10 || (__GNUC__ == 10 && __GNUC_MINOR__ >= 1) #define FP_GNUC_ACCESS(m, p, s) __attribute__((access (m, p, s))) #else