]> git.proxmox.com Git - qemu.git/commitdiff
qemu-timer: Fix compilation of new timer code for w32, w64
authorStefan Weil <weil@mail.berlios.de>
Fri, 4 Feb 2011 21:01:32 +0000 (22:01 +0100)
committerAurelien Jarno <aurelien@aurel32.net>
Tue, 8 Feb 2011 08:06:41 +0000 (09:06 +0100)
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)

qemu-timer.c

index 658f637ceddf3fe9989773ae3d5c1ab738715318..b0db780a1e6de35d77e0ca32e56b6958706006f7 100644 (file)
@@ -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;