diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-04-17 21:03:15 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-04-17 22:19:24 -0500 |
| commit | 0979c50b831c67e0b4f4a560435b867b35cdac67 (patch) | |
| tree | d8afcae43c137abc797cb936a3aff0957add6c91 | |
| parent | 36e0a4286937ccb25bc78392a679f496029765b0 (diff) | |
| download | musl-0979c50b831c67e0b4f4a560435b867b35cdac67.tar.gz musl-0979c50b831c67e0b4f4a560435b867b35cdac67.tar.bz2 musl-0979c50b831c67e0b4f4a560435b867b35cdac67.tar.xz musl-0979c50b831c67e0b4f4a560435b867b35cdac67.zip | |
time: C11 visibility fixes
The timespec_get function, and TIME_* macros, are only in C11.
Since musl is compiled with -std=c99, TIME_UTC is unavailable in the
timespec_get implementation, so we use the raw value 1.
| -rw-r--r-- | include/time.h | 7 | ||||
| -rw-r--r-- | src/time/timespec_get.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/time.h b/include/time.h index 672b3fc3..c5946dd0 100644 --- a/include/time.h +++ b/include/time.h @@ -58,11 +58,14 @@ struct tm *gmtime (const time_t *); struct tm *localtime (const time_t *); char *asctime (const struct tm *); char *ctime (const time_t *); -int timespec_get(struct timespec *, int); -#define CLOCKS_PER_SEC 1000000L +#if __STDC_VERSION__ >= 201112L +int timespec_get(struct timespec *, int); #define TIME_UTC 1 +#endif + +#define CLOCKS_PER_SEC 1000000L #if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) \ || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \ diff --git a/src/time/timespec_get.c b/src/time/timespec_get.c index 03c5a77b..c423b825 100644 --- a/src/time/timespec_get.c +++ b/src/time/timespec_get.c @@ -6,7 +6,7 @@ int __clock_gettime(clockid_t, struct timespec *); * are considered erroneous. */ int timespec_get(struct timespec * ts, int base) { - if (base != TIME_UTC) return 0; + if (base != 1) return 0; int ret = __clock_gettime(CLOCK_REALTIME, ts); return ret < 0 ? 0 : base; } |