From patchwork Fri Feb 4 21:01:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 81952 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D66CEB712E for ; Sat, 5 Feb 2011 08:02:14 +1100 (EST) Received: from localhost ([127.0.0.1]:53340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PlSnD-0006M3-8X for incoming@patchwork.ozlabs.org; Fri, 04 Feb 2011 16:02:11 -0500 Received: from [140.186.70.92] (port=45637 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PlSmh-0006Lr-Sn for qemu-devel@nongnu.org; Fri, 04 Feb 2011 16:01:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PlSmf-0005qA-VK for qemu-devel@nongnu.org; Fri, 04 Feb 2011 16:01:39 -0500 Received: from moutng.kundenserver.de ([212.227.17.9]:53565) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PlSmf-0005pp-Iu for qemu-devel@nongnu.org; Fri, 04 Feb 2011 16:01:37 -0500 Received: from flocke.fritz.box (p54AD9EA2.dip.t-dialin.net [84.173.158.162]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0Lno8B-1QMjoH09hH-00hs2e; Fri, 04 Feb 2011 22:01:34 +0100 Received: from stefan by flocke.fritz.box with local (Exim 4.72) (envelope-from ) id 1PlSmb-0002Cp-5A; Fri, 04 Feb 2011 22:01:33 +0100 From: Stefan Weil To: QEMU Developers Date: Fri, 4 Feb 2011 22:01:32 +0100 Message-Id: <1296853292-8450-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.2.3 X-Provags-ID: V02:K0:fZrnSgT+g52OrQK+FSCDmsy7geDXWvyvSfDDJ6riao/ r1PEuYMUNWsDbvtUS6Kas5hpFj02YmF+GgoHs1v2KGrTU7ehUz 3HJuR8osuLXl91YbgXVkvEWjlGmsQJyKj50w1AUjen4dqrfkoR j9zFcCd2+v0TlnTXmcb7+tLjEkp0iSelA3DW+DA/KufkR9w9EF EH2cvW19DVgBWM0c5UgbaIX6X/WbBN8gKMoM1mex9u+A1CmWg2 1OXsL9M5nmRMK X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.227.17.9 Cc: Anthony Liguori , Paolo Bonzini Subject: [Qemu-devel] [PATCH] qemu-timer: Fix compilation of new timer code for w32, w64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org qemu_next_alarm_deadline() is needed by MinGW, too. Cc: Paolo Bonzini Cc: Anthony Liguori Signed-off-by: Stefan Weil Acked-by: Paolo Bonzini --- qemu-timer.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu-timer.c b/qemu-timer.c index b1a3a84..2de02fe 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -706,8 +706,6 @@ int64_t qemu_next_deadline(void) return delta; } -#ifndef _WIN32 - static int64_t qemu_next_alarm_deadline(void) { int64_t delta; @@ -920,6 +918,8 @@ static void dynticks_rearm_timer(struct qemu_alarm_timer *t) #endif /* defined(__linux__) */ +#if !defined(_WIN32) + static int unix_start_timer(struct qemu_alarm_timer *t) { struct sigaction act;