From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5Gq3-0000j2-Ig for qemu-devel@nongnu.org; Thu, 10 Jul 2014 12:04:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5Gpx-0004OY-N7 for qemu-devel@nongnu.org; Thu, 10 Jul 2014 12:04:51 -0400 Received: from mail-we0-x22d.google.com ([2a00:1450:400c:c03::22d]:34963) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5Gpx-0004OB-Fu for qemu-devel@nongnu.org; Thu, 10 Jul 2014 12:04:45 -0400 Received: by mail-we0-f173.google.com with SMTP id t60so9318294wes.18 for ; Thu, 10 Jul 2014 09:04:44 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 10 Jul 2014 18:04:13 +0200 Message-Id: <1405008253-9816-11-git-send-email-pbonzini@redhat.com> In-Reply-To: <1405008253-9816-1-git-send-email-pbonzini@redhat.com> References: <1405008253-9816-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 10/10] 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: Nikolay Nikolaev 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 Signed-off-by: Paolo Bonzini --- 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 -- 1.8.3.1