From bc64b5ce191d48b503e4fad8c0cefb774a2fa969 Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Sat, 23 May 2020 20:37:33 +0000 Subject: Import Zstd 1.4.5 --- programs/timefn.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'programs/timefn.c') diff --git a/programs/timefn.c b/programs/timefn.c index 096e1910bf4b..95460d0d971d 100644 --- a/programs/timefn.c +++ b/programs/timefn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019-present, Yann Collet, Facebook, Inc. + * Copyright (c) 2019-2020, Yann Collet, Facebook, Inc. * All rights reserved. * * This source code is licensed under both the BSD-style license (found in the @@ -82,9 +82,10 @@ PTime UTIL_getSpanTimeNano(UTIL_time_t clockStart, UTIL_time_t clockEnd) } - +/* C11 requires timespec_get, but FreeBSD 11 lacks it, while still claiming C11 compliance. + Android also lacks it but does define TIME_UTC. */ #elif (defined (__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) /* C11 */) \ - && defined(TIME_UTC) /* C11 requires timespec_get, but FreeBSD 11 lacks it, while still claiming C11 compliance */ + && defined(TIME_UTC) && !defined(__ANDROID__) #include /* abort */ #include /* perror */ -- cgit v1.2.3