diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2015-04-02 17:17:45 +0200 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-04-02 16:53:42 +0100 |
| commit | 439b24559c74982ec43dc7e99cd45ff050aae7d5 (patch) | |
| tree | b1eea3bc4de09c384227350dca69843ec0956f15 | |
| parent | 7c12cf892ed3c2cd6a2a276114d68906da9bcd40 (diff) | |
glib-compat: fix problems with not-quite glib 2.22v2.3.0-rc4v2.3.0-rc3v2.3.0-rc2v2.3.0
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.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/glib-compat.h b/include/glib-compat.h index f0615c9..011352b 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) |