]> xenbits.xensource.com Git - qemu-upstream-4.6-testing.git/commit
glib-compat: fix problems with not-quite glib 2.22
authorCornelia Huck <cornelia.huck@de.ibm.com>
Thu, 2 Apr 2015 15:17:45 +0000 (17:17 +0200)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Thu, 23 Apr 2015 14:04:33 +0000 (14:04 +0000)
commit6a47d1ef7af7f5df35986b5084ce61a2255b649e
tree2012e4816cb91f7faf84acbb76251388b38910e4
parent727b998448e852a5e8eb570ac3a259ef62fbdacb
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.

upstream-commit-id: 14655e9a18276d67eebad62a9c388ca5964bb353

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>
include/glib-compat.h