From 602f4506a8677b1710d7af215196cb19433ae55c Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 3 Jan 2019 23:54:56 +0100 Subject: [PATCH] Add glib 2.38 support --- configure.ac | 2 +- test/test-utils-glib.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index bdd82d460..a5a7fd3e9 100644 --- a/configure.ac +++ b/configure.ac @@ -271,7 +271,7 @@ fi dnl Don't do anything too subtle here, because the CMake build system dnl parses these lines with regular expressions. If necessary, adjust dnl cmake/modules/MacrosAutotools.cmake to compensate. -AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_40], [Ignore post-2.40 deprecations]) +AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_38], [Ignore post-2.38 deprecations]) AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [G_ENCODE_VERSION(2,44)], [Prevent post-2.44 APIs]) with_glib=yes diff --git a/test/test-utils-glib.h b/test/test-utils-glib.h index 93b52b74f..ce8171bd1 100644 --- a/test/test-utils-glib.h +++ b/test/test-utils-glib.h @@ -121,6 +121,10 @@ backported_g_steal_pointer (gpointer pointer_to_pointer) } #endif +#ifndef g_assert_nonnull +#define g_assert_nonnull(a) g_assert (a != NULL) +#endif + gboolean test_check_tcp_works (void); void test_store_result_cb (GObject *source_object, -- 2.47.3