From: Stefan Weil <weil@mail.berlios.de>
Date: Fri, 4 Feb 2011 21:01:32 +0000 (+0100)
Subject: qemu-timer: Fix compilation of new timer code for w32, w64
X-Git-Tag: v0.14.0-rc2~15^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b75568889fd3eb373a61ad70fb2db7ebd73bf1a7;p=thirdparty%2Fqemu.git

qemu-timer: Fix compilation of new timer code for w32, w64

qemu_next_alarm_deadline() is needed by MinGW, too.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
(cherry picked from commit f26e5a54f0554798a2e6f7a074b809b13635d007)
---

diff --git a/qemu-timer.c b/qemu-timer.c
index 658f637cedd..b0db780a1e6 100644
--- a/qemu-timer.c
+++ b/qemu-timer.c
@@ -708,8 +708,6 @@ int64_t qemu_next_deadline(void)
     return delta;
 }
 
-#ifndef _WIN32
-
 static int64_t qemu_next_alarm_deadline(void)
 {
     int64_t delta;
@@ -922,6 +920,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;