From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zlam1-0002KG-Q6 for qemu-devel@nongnu.org; Mon, 12 Oct 2015 06:56:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zlalx-0006P9-N6 for qemu-devel@nongnu.org; Mon, 12 Oct 2015 06:56:09 -0400 Received: from mail-pa0-x230.google.com ([2607:f8b0:400e:c03::230]:35568) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zlalx-0006Oc-Hd for qemu-devel@nongnu.org; Mon, 12 Oct 2015 06:56:05 -0400 Received: by pabve7 with SMTP id ve7so93547299pab.2 for ; Mon, 12 Oct 2015 03:56:05 -0700 (PDT) Sender: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= From: marcandre.lureau@redhat.com Date: Mon, 12 Oct 2015 12:54:59 +0200 Message-Id: <1444647299-28642-4-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1444647299-28642-1-git-send-email-marcandre.lureau@redhat.com> References: <1444647299-28642-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH 3/3] Remove glib < 2.26 compatibility code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-André Lureau Since 2.26 is now the minimum. Signed-off-by: Marc-André Lureau --- 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 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 /* 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