diff options
| author | Conrad Meyer <cem@FreeBSD.org> | 2020-05-23 20:37:33 +0000 |
|---|---|---|
| committer | Conrad Meyer <cem@FreeBSD.org> | 2020-05-23 20:37:33 +0000 |
| commit | bc64b5ce191d48b503e4fad8c0cefb774a2fa969 (patch) | |
| tree | 9b41925d7159f1f57c1b59a1a5f887c80a57e999 /programs/timefn.h | |
| parent | ea68403922c3b53b00fc999fcb3eaef1feb50177 (diff) | |
| download | src-test2-bc64b5ce191d48b503e4fad8c0cefb774a2fa969.tar.gz src-test2-bc64b5ce191d48b503e4fad8c0cefb774a2fa969.zip | |
Import Zstd 1.4.5vendor/zstd/1.4.5vendor/zstd
Notes
Notes:
svn path=/vendor/zstd/dist/; revision=361423
svn path=/vendor/zstd/1.4.5/; revision=361424; tag=vendor/zstd/1.4.5
Diffstat (limited to 'programs/timefn.h')
| -rw-r--r-- | programs/timefn.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/programs/timefn.h b/programs/timefn.h index 2db3765b9308..eb3c130934eb 100644 --- a/programs/timefn.h +++ b/programs/timefn.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-present, Yann Collet, Facebook, Inc. + * Copyright (c) 2016-2020, Yann Collet, Facebook, Inc. * All rights reserved. * * This source code is licensed under both the BSD-style license (found in the @@ -41,7 +41,7 @@ extern "C" { ******************************************/ #if defined(_WIN32) /* Windows */ - #include <Windows.h> /* LARGE_INTEGER */ + #include <windows.h> /* LARGE_INTEGER */ typedef LARGE_INTEGER UTIL_time_t; #define UTIL_TIME_INITIALIZER { { 0, 0 } } @@ -51,8 +51,10 @@ extern "C" { typedef PTime UTIL_time_t; #define UTIL_TIME_INITIALIZER 0 +/* 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__) typedef struct timespec UTIL_time_t; #define UTIL_TIME_INITIALIZER { 0, 0 } |