Commit 14655e9a authored by Cornelia Huck's avatar Cornelia Huck Committed by Peter Maydell
Browse files

glib-compat: fix problems with not-quite glib 2.22 



Commit 89b516d8 ("glib: add
compatibility interface for g_get_monotonic_time()") aimed
at making qemu build with old glib versions. At least SLES11SP3,
however, contains a backport of g_get_monotonic_time() while
keeping the reported glib version at 2.22.

Let's work around this by a strategically placed #define.

Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Message-id: 1427987865-433-2-git-send-email-cornelia.huck@de.ibm.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent a8a7ef14

include/glib-compat.h

+3 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ static inline guint g_timeout_add_seconds(guint interval, GSourceFunc function, 
#endif



#if !GLIB_CHECK_VERSION(2, 28, 0)

static inline gint64 g_get_monotonic_time(void)

static inline gint64 qemu_g_get_monotonic_time(void)

{

    /* g_get_monotonic_time() is best-effort so we can use the wall clock as a

     * fallback.
@@ -43,6 +43,8 @@ static inline gint64 g_get_monotonic_time(void) 


    return time.tv_sec * G_TIME_SPAN_SECOND + time.tv_usec;

}

/* work around distro backports of this interface */

#define g_get_monotonic_time() qemu_g_get_monotonic_time()

#endif



#if !GLIB_CHECK_VERSION(2, 16, 0)