From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60330) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5Da0-0005Jd-M8 for qemu-devel@nongnu.org; Thu, 10 Jul 2014 08:36:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5DZu-00079V-UK for qemu-devel@nongnu.org; Thu, 10 Jul 2014 08:36:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5DZu-00079F-L7 for qemu-devel@nongnu.org; Thu, 10 Jul 2014 08:35:58 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6ACZu5h004343 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 10 Jul 2014 08:35:57 -0400 From: Kevin Wolf Date: Thu, 10 Jul 2014 14:35:22 +0200 Message-Id: <1404995727-27471-18-git-send-email-kwolf@redhat.com> In-Reply-To: <1404995727-27471-1-git-send-email-kwolf@redhat.com> References: <1404995727-27471-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL for-2.1 17/22] 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: kwolf@redhat.com 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 Tested-by: Kevin Wolf Signed-off-by: Kevin Wolf --- 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