From: marcandre.lureau@redhat.com
To: qemu-devel@nongnu.org
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [Qemu-devel] [PATCH 3/3] Remove glib < 2.26 compatibility code
Date: Mon, 12 Oct 2015 12:54:59 +0200 [thread overview]
Message-ID: <1444647299-28642-4-git-send-email-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <1444647299-28642-1-git-send-email-marcandre.lureau@redhat.com>
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 --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
--
2.4.3
next prev parent reply other threads:[~2015-10-12 10:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-12 10:54 [Qemu-devel] [PATCH 0/3] Use glib 2.26 version macros marcandre.lureau
2015-10-12 10:54 ` [Qemu-devel] [PATCH 1/3] hw/acpi/aml-build: remove useless glib version check marcandre.lureau
2015-10-12 13:31 ` Marc-André Lureau
2015-10-29 7:28 ` Michael Tokarev
2015-10-12 10:54 ` [Qemu-devel] [PATCH 2/3] configure: require glib 2.26 marcandre.lureau
2015-10-12 10:54 ` marcandre.lureau [this message]
2015-10-12 11:18 ` [Qemu-devel] [PATCH 0/3] Use glib 2.26 version macros Cornelia Huck
2015-10-12 11:26 ` Daniel P. Berrange
2015-10-12 12:24 ` Marc-André Lureau
2015-10-12 12:31 ` Daniel P. Berrange
2015-10-12 12:38 ` Peter Maydell
2015-10-12 16:02 ` John Snow
2015-10-12 16:34 ` Dr. David Alan Gilbert
2015-10-12 17:10 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444647299-28642-4-git-send-email-marcandre.lureau@redhat.com \
--to=marcandre.lureau@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).