diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2023-05-01 18:26:41 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2023-05-01 18:26:41 +0000 |
| commit | 1895ed84d7f4e1dcd7297350710d3807fe590cb8 (patch) | |
| tree | c4dfe84bcf81bf9470123b686504a40e41d88b3a | |
| parent | 4057f8c84ff8c834dcd1cb82f946dd8cc49712ff (diff) | |
| parent | 03c0a105884ab339d94b9a6ce9cd70da5f8aec6d (diff) | |
| download | dconf-1895ed84d7f4e1dcd7297350710d3807fe590cb8.tar.gz | |
Merge branch 'g_memdup2' into 'master'
tests: Use g_memdup2
See merge request GNOME/dconf!73
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | tests/gvdb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build index b81a81a..50e3202 100644 --- a/meson.build +++ b/meson.build @@ -43,7 +43,7 @@ gio_req_version = '>= 2.25.7' gio_dep = dependency('gio-2.0', version: gio_req_version) gio_unix_dep = dependency('gio-unix-2.0', version: gio_req_version) -glib_dep = dependency('glib-2.0', version: '>= 2.44.0') +glib_dep = dependency('glib-2.0', version: '>= 2.67.4') gio_module_dir = gio_dep.get_pkgconfig_variable('giomoduledir', define_variable: ['libdir', dconf_libdir]) dbus_session_service_dir = dependency('dbus-1').get_pkgconfig_variable('session_bus_services_dir', define_variable: ['datadir', dconf_datadir]) diff --git a/tests/gvdb.c b/tests/gvdb.c index 765f4b8..90f933c 100644 --- a/tests/gvdb.c +++ b/tests/gvdb.c @@ -361,7 +361,7 @@ test_corrupted (gconstpointer user_data) orig = g_mapped_file_get_contents (mapped); length = g_mapped_file_get_length (mapped); - copy = g_memdup (orig, length); + copy = g_memdup2 (orig, length); for (i = 0; i < 10000; i++) { |