From 3858a930a9d3df332f5311719af4507972033004 Mon Sep 17 00:00:00 2001 From: Jupeyy Date: Mon, 12 Mar 2018 17:10:11 +0100 Subject: [PATCH] merge mac and linux impl into one --- src/base/system.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/base/system.c b/src/base/system.c index 5f35ff250..edc0474da 100644 --- a/src/base/system.c +++ b/src/base/system.c @@ -1010,14 +1010,10 @@ int64 time_freq() int64 time_get_microseconds() { -#if defined(CONF_PLATFORM_MACOSX) - return time_get_impl() / (time_freq() / 1000 / 1000 / 1000); -#elif defined(CONF_FAMILY_UNIX) - return time_get_impl() / (time_freq() / 1000 / 1000); -#elif defined(CONF_FAMILY_WINDOWS) +#if defined(CONF_FAMILY_WINDOWS) return (time_get_impl() * (int64)1000000) / time_freq(); #else - #error not implemented + return time_get_impl() / (time_freq() / 1000 / 1000); #endif }