summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2011-02-04 22:01:32 +0100
committerAurelien Jarno <aurelien@aurel32.net>2011-02-08 09:06:41 +0100
commitb75568889fd3eb373a61ad70fb2db7ebd73bf1a7 (patch)
treebbfd9346e5b0acef635f1a19d7df13ae8e698e85
parenta3dfab563e214c00d3d21d0d94a25d37449182d5 (diff)
downloadqemu-b75568889fd3eb373a61ad70fb2db7ebd73bf1a7.tar.gz
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)
-rw-r--r--qemu-timer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu-timer.c b/qemu-timer.c
index 658f637ced..b0db780a1e 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;