From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=34607 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PlkBE-0004HI-7m
	for qemu-devel@nongnu.org; Sat, 05 Feb 2011 10:36:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1PlkBD-0002aJ-48
	for qemu-devel@nongnu.org; Sat, 05 Feb 2011 10:36:08 -0500
Received: from mail-wy0-f173.google.com ([74.125.82.173]:42675)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1PlkBC-0002aC-RE
	for qemu-devel@nongnu.org; Sat, 05 Feb 2011 10:36:07 -0500
Received: by wyg36 with SMTP id 36so3371446wyg.4
	for <qemu-devel@nongnu.org>; Sat, 05 Feb 2011 07:36:06 -0800 (PST)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <4D4D6E63.2010303@redhat.com>
Date: Sat, 05 Feb 2011 16:36:03 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1296853292-8450-1-git-send-email-weil@mail.berlios.de>
In-Reply-To: <1296853292-8450-1-git-send-email-weil@mail.berlios.de>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PATCH] qemu-timer: Fix compilation of new timer
 code for w32, w64
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Weil <weil@mail.berlios.de>
Cc: Anthony Liguori <aliguori@us.ibm.com>, QEMU Developers <qemu-devel@nongnu.org>

On 02/04/2011 10:01 PM, Stefan Weil wrote:
> qemu_next_alarm_deadline() is needed by MinGW, too.
>
> Cc: Paolo Bonzini<pbonzini@redhat.com>
> Cc: Anthony Liguori<aliguori@us.ibm.com>
> Signed-off-by: Stefan Weil<weil@mail.berlios.de>
> ---
>   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;

Acked-by: Paolo Bonzini <pbonzini@redhat.com>

Thanks,

Paolo