Work around g_memdup deprecation

mdbtools · Jul 24, 2021 · 62ce520 · 62ce520
1 parent d143996
commit 62ce520
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/configure.ac b/configure.ac
@@ -88,7 +88,8 @@ fi
 AC_SUBST(GTK3_CFLAGS)
 AC_SUBST(GTK3_LIBS)
 
-AC_DEFINE(HAVE_GLIB, 1, [glib check])
+AC_DEFINE([HAVE_GLIB], [1], [glib check])
+AC_CHECK_LIB(glib-2.0, g_memdup2, [AC_DEFINE([HAVE_G_MEMDUP2], [1], [g_memdup2 check])])
 
 GLIB_GSETTINGS
 

diff --git a/src/debug.c b/src/debug.c
@@ -217,7 +217,7 @@ gmdb_nav_add_page(GtkWidget *win, guint32 page_num)
 		}
 	}
 
-	nav_list = g_list_append(nav_list, g_memdup(&page_num, 4));
+	nav_list = g_list_append(nav_list, g_memdup2(&page_num, 4));
 	*nav_elem = g_list_length(nav_list);
 
 	g_object_set_data(G_OBJECT(win), "nav_list", nav_list);

diff --git a/src/gmdb.h b/src/gmdb.h
@@ -13,6 +13,10 @@
 #include <mdbtools.h>
 #include <mdbsql.h>
 
+#ifndef HAVE_G_MEMDUP2
+#define g_memdup2(p, sz) g_memdup(p, sz)
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */