Commit 602f4506 authored by Ralf Habacker's avatar Ralf Habacker

Add glib 2.38 support

parent fb748412
...@@ -271,7 +271,7 @@ fi ...@@ -271,7 +271,7 @@ fi
dnl Don't do anything too subtle here, because the CMake build system dnl Don't do anything too subtle here, because the CMake build system
dnl parses these lines with regular expressions. If necessary, adjust dnl parses these lines with regular expressions. If necessary, adjust
dnl cmake/modules/MacrosAutotools.cmake to compensate. 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]) AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [G_ENCODE_VERSION(2,44)], [Prevent post-2.44 APIs])
with_glib=yes with_glib=yes
......
...@@ -121,6 +121,10 @@ backported_g_steal_pointer (gpointer pointer_to_pointer) ...@@ -121,6 +121,10 @@ backported_g_steal_pointer (gpointer pointer_to_pointer)
} }
#endif #endif
#ifndef g_assert_nonnull
#define g_assert_nonnull(a) g_assert (a != NULL)
#endif
gboolean test_check_tcp_works (void); gboolean test_check_tcp_works (void);
void test_store_result_cb (GObject *source_object, void test_store_result_cb (GObject *source_object,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment