From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WM35i-0002O3-1M for qemu-devel@nongnu.org; Fri, 07 Mar 2014 17:18:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WM35h-0005sc-6u for qemu-devel@nongnu.org; Fri, 07 Mar 2014 17:18:05 -0500 Received: from qemu.weilnetz.de ([2a03:4000:2:362::1]:40270 helo=v2201305906712890.yourvserver.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WM35h-0005sX-0W for qemu-devel@nongnu.org; Fri, 07 Mar 2014 17:18:05 -0500 From: Stefan Weil Date: Fri, 7 Mar 2014 23:17:44 +0100 Message-Id: <1394230667-17037-3-git-send-email-sw@weilnetz.de> In-Reply-To: <1394230667-17037-1-git-send-email-sw@weilnetz.de> References: <1394230667-17037-1-git-send-email-sw@weilnetz.de> Subject: [Qemu-devel] [PATCH v2 2/5] w32: Move inline function from header file to C source List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, Stefan Weil , stefanha@redhat.com, peter.maydell@linaro.org A lot of files depend on qemu/timer.h. We don't want that all these files depend on windows.h, too. Signed-off-by: Stefan Weil --- include/qemu/timer.h | 8 +------- util/qemu-timer-common.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/qemu/timer.h b/include/qemu/timer.h index 7f9a074..19316b7 100644 --- a/include/qemu/timer.h +++ b/include/qemu/timer.h @@ -712,14 +712,8 @@ static inline int64_t get_clock_realtime(void) also used by simpletrace backend and tracepoints would cause an infinite recursion! */ #ifdef _WIN32 -extern int64_t clock_freq; -static inline int64_t get_clock(void) -{ - LARGE_INTEGER ti; - QueryPerformanceCounter(&ti); - return muldiv64(ti.QuadPart, get_ticks_per_sec(), clock_freq); -} +int64_t get_clock(void); #else diff --git a/util/qemu-timer-common.c b/util/qemu-timer-common.c index 95e0847..22b0109 100644 --- a/util/qemu-timer-common.c +++ b/util/qemu-timer-common.c @@ -28,7 +28,16 @@ #ifdef _WIN32 -int64_t clock_freq; +#include "qemu/winapi.h" /* QueryPerformanceCounter, ... */ + +static int64_t clock_freq; + +int64_t get_clock(void) +{ + LARGE_INTEGER ti; + QueryPerformanceCounter(&ti); + return muldiv64(ti.QuadPart, get_ticks_per_sec(), clock_freq); +} static void __attribute__((constructor)) init_get_clock(void) { -- 1.7.10.4