diff options
| author | Simon McVittie <smcv@collabora.com> | 2017-07-24 12:30:57 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2017-11-06 14:07:21 +0000 |
| commit | d5742550ca566317eaddea0ff7db04098f9f044f (patch) | |
| tree | afaed2301b64ca15449328cebb2d779f9e4308bd /configure.ac | |
| parent | 83b439f7b4c6a946e0fe9a0287910ba4f6318143 (diff) | |
| download | dbus-d5742550ca566317eaddea0ff7db04098f9f044f.tar.gz | |
Add a simplified backport of g_steal_pointer()
This will be used in tests later in the branch.
Sadly we can't use GLIB_VERSION_2_44 unless we are willing to have a
hard dependency on GLib 2.44, which would force us to do all our
Travis-CI builds in Docker containers rather than in ye olde base
system, and that adds 50% to the time taken to do builds.
Reviewed-by: Philip Withnall <withnall@endlessm.com>
[smcv: Rebase onto 1.13.x branch, fix minor conflicts]
Signed-off-by: Simon McVittie <smcv@collabora.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101354
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index dff9ad5d..ce1f2c56 100644 --- a/configure.ac +++ b/configure.ac @@ -262,7 +262,7 @@ 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_MAX_ALLOWED], [GLIB_VERSION_2_40], [Prevent post-2.40 APIs]) +AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [G_ENCODE_VERSION(2,44)], [Prevent post-2.44 APIs]) with_glib=yes |