aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2015-04-02 17:17:45 +0200
committerPeter Maydell <peter.maydell@linaro.org>2015-04-02 16:53:42 +0100
commit14655e9a18276d67eebad62a9c388ca5964bb353 (patch)
treee8bf9e3c70811f28785a562bd3b92fae5c407da7
parenta8a7ef145d6e97853ce4ecc9277475e1726ff757 (diff)
glib-compat: fix problems with not-quite glib 2.22
Commit 89b516d8b9444ece8ccabb322a9389587c7a7b83 ("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: Cornelia Huck <cornelia.huck@de.ibm.com> Message-id: 1427987865-433-2-git-send-email-cornelia.huck@de.ibm.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--include/glib-compat.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/glib-compat.h b/include/glib-compat.h
index f0615c99c2..011352b2b6 100644
--- a/include/glib-compat.h
+++ b/include/glib-compat.h
@@ -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)