mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Commit 89b516d8b9 ("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>
This commit is contained in:
Cornelia Huck 2015-04-02 17:17:45 +02:00 committed by Peter Maydell
parent a8a7ef145d
commit 14655e9a18
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/glib-compat.h
View File

@ -32,7 +32,7 @@ static inline guint g_timeout_add_seconds(guint interval, GSourceFunc function,
#endif #endif
#if !GLIB_CHECK_VERSION(2, 28, 0) #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 /* g_get_monotonic_time() is best-effort so we can use the wall clock as a
* fallback. * fallback.
@ -43,6 +43,8 @@ static inline gint64 g_get_monotonic_time(void)
return time.tv_sec * G_TIME_SPAN_SECOND + time.tv_usec; 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 #endif
#if !GLIB_CHECK_VERSION(2, 16, 0) #if !GLIB_CHECK_VERSION(2, 16, 0)