From 36d2dfd846e1e33cc149d4f6da78e785faa6a865 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Wed, 10 Apr 2019 14:15:11 -0700 Subject: [PATCH] moved C11 code path to timespec_get --- programs/timefn.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/programs/timefn.c b/programs/timefn.c index cb545ad67..8c6010c90 100644 --- a/programs/timefn.c +++ b/programs/timefn.c @@ -11,9 +11,6 @@ /* === Dependencies === */ -#include /* abort */ -#include /* perror */ - #include "timefn.h" @@ -23,6 +20,9 @@ #if defined(_WIN32) /* Windows */ +#include /* abort */ +#include /* perror */ + UTIL_time_t UTIL_getTime(void) { UTIL_time_t x; QueryPerformanceCounter(&x); return x; } PTime UTIL_getSpanTimeMicro(UTIL_time_t clockStart, UTIL_time_t clockEnd) @@ -83,14 +83,16 @@ PTime UTIL_getSpanTimeNano(UTIL_time_t clockStart, UTIL_time_t clockEnd) -#elif (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */) \ - && defined (CLOCK_MONOTONIC) +#elif (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */) + +#include /* abort */ +#include /* perror */ UTIL_time_t UTIL_getTime(void) { UTIL_time_t time; - if (clock_gettime(CLOCK_MONOTONIC, &time)) { - perror("timefb::clock_gettime"); + if (timespec_get(&time, TIME_UTC) == 0) { + perror("timefn::timespec_get"); abort(); } return time; -- 2.47.3