From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7vJx-0006EA-UN for qemu-devel@nongnu.org; Thu, 17 Jul 2014 19:42:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X7vJi-0000Ye-JA for qemu-devel@nongnu.org; Thu, 17 Jul 2014 19:42:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24764) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7vJi-0000Y4-Ay for qemu-devel@nongnu.org; Thu, 17 Jul 2014 19:42:26 -0400 Date: Fri, 18 Jul 2014 02:44:44 +0300 From: "Michael S. Tsirkin" Message-ID: <1405640614-9252-5-git-send-email-mst@redhat.com> References: <1405640614-9252-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1405640614-9252-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL v2 4/7] qtest: fix vhost-user-test compilation with old GLib List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Peter Maydell , Nikolay Nikolaev , Anthony Liguori , Antonios Motakis From: Nikolay Nikolaev Mising G_TIME_SPAN_SECOND definition breaks the RHEL6 compilation as GLib version before 2.26 does not have it. In such case just define it. Reported-by: Kevin Wolf Signed-off-by: Nikolay Nikolaev Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/vhost-user-test.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 2af2381..406ba70 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -22,6 +22,10 @@ #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 -- MST