fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 13:28:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'glib-2.38-support' into 'master'

Browse source 
Add glib 2.38 support

See merge request dbus/dbus!79

Reviewed-by: Philip Withnall
Reviewed-by: Simon McVittie
This commit is contained in:
Ralf Habacker 2019-01-07 09:27:55 +00:00
commit 276e766c97
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -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

4
test/test-utils-glib.h
View file

@ -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,