From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6flR-0002oZ-Cm for qemu-devel@nongnu.org; Tue, 06 Aug 2013 07:49:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V6flL-0007rh-DH for qemu-devel@nongnu.org; Tue, 06 Aug 2013 07:49:21 -0400 From: Stefan Hajnoczi Date: Tue, 6 Aug 2013 13:48:58 +0200 Message-Id: <1375789738-28034-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH for-1.6] qemu-timer: fix get_clock() gettimeofday() fallback #ifdef List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , qemu-stable@nongnu.org, Stefan Hajnoczi If CLOCK_MONOTONIC is not defined by system headers we use gettimeofday(2). Apparently this is not used very often since no one noticed the #ifdef was actually broken and left the function definition unterminated. Signed-off-by: Stefan Hajnoczi --- include/qemu/timer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 9dd206c..e3299b8 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -125,8 +125,8 @@ static inline int64_t get_clock(void) changes, so it should be avoided. */ return get_clock_realtime(); } -} #endif +} void qemu_get_timer(QEMUFile *f, QEMUTimer *ts); void qemu_put_timer(QEMUFile *f, QEMUTimer *ts); -- 1.8.1.4