diff mbox

[3/3] Remove glib < 2.26 compatibility code

Message ID 1444647299-28642-4-git-send-email-marcandre.lureau@redhat.com
State New
Headers show

Commit Message

Marc-André Lureau Oct. 12, 2015, 10:54 a.m. UTC 
From: Marc-André Lureau <marcandre.lureau@redhat.com>

Since 2.26 is now the minimum.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 include/glib-compat.h   | 4 ----
 tests/vhost-user-test.c | 4 ----
 2 files changed, 8 deletions(-)
diff mbox

Patch

diff --git a/include/glib-compat.h b/include/glib-compat.h
index 318e000..46a2bc5 100644
--- a/include/glib-compat.h
+++ b/include/glib-compat.h
@@ -19,10 +19,6 @@ 
 #include <glib.h>
 
 /* GLIB version compatibility flags */
-#if !GLIB_CHECK_VERSION(2, 26, 0)
-#define G_TIME_SPAN_SECOND              (G_GINT64_CONSTANT(1000000))
-#endif
-
 #if !GLIB_CHECK_VERSION(2, 28, 0)
 static inline gint64 qemu_g_get_monotonic_time(void)
 {
diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 56df5cc..9f2254d 100644
--- a/tests/vhost-user-test.c
+++ b/tests/vhost-user-test.c
@@ -21,10 +21,6 @@ 
 #include <qemu/sockets.h>
 
 /* GLIB version compatibility flags */
-#if !GLIB_CHECK_VERSION(2, 26, 0)
-#define G_TIME_SPAN_SECOND              (G_GINT64_CONSTANT(1000000))
-#endif
-
 #if GLIB_CHECK_VERSION(2, 28, 0)
 #define HAVE_MONOTONIC_TIME
 #endif