diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/time.h | 8 | ||||
| -rw-r--r-- | time/gmtime.c | 18 |
3 files changed, 31 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index fe1b8fcec6..5dfc488554 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ 2018-12-18 Albert ARIBAUD <albert.aribaud@3adev.fr> * include/time.h + (__gmtime64_r): Add. + * time/gmtime.c + (__gmtime64_r): Add. + [__TIMESIZE != 64] (__gmtime): Turn into a wrapper. + + * include/time.h (__gmtime64): Add. * time/gmtime.c (__gmtime64): Add. diff --git a/include/time.h b/include/time.h index c5881acf9f..fb93d647d8 100644 --- a/include/time.h +++ b/include/time.h @@ -86,6 +86,14 @@ extern struct tm *__gmtime64 (const __time64_t *__timer); libc_hidden_proto (__gmtime64) #endif +#if __TIMESIZE == 64 +# define __gmtime64_r __gmtime_r +#else +extern struct tm *__gmtime64_r (const __time64_t *__restrict __timer, + struct tm *__restrict __tp); +libc_hidden_proto (__gmtime64_r); +#endif + /* Compute the `struct tm' representation of T, offset OFFSET seconds east of UTC, and store year, yday, mon, mday, wday, hour, min, sec into *TP. diff --git a/time/gmtime.c b/time/gmtime.c index ee901c3ba1..dff50f012f 100644 --- a/time/gmtime.c +++ b/time/gmtime.c @@ -21,10 +21,26 @@ /* Return the `struct tm' representation of *T in UTC, using *TP to store the result. */ struct tm * -__gmtime_r (const time_t *t, struct tm *tp) +__gmtime64_r (const __time64_t *t, struct tm *tp) { return __tz_convert (*t, 0, tp); } + +/* Provide a 32-bit variant if needed. */ + +#if __TIMESIZE != 64 + +libc_hidden_def (__gmtime64_r) + +struct tm * +__gmtime_r (const time_t *t, struct tm *tp) +{ + __time64_t t64 = *t; + return __gmtime64_r (&t64, tp); +} + +#endif + libc_hidden_def (__gmtime_r) weak_alias (__gmtime_r, gmtime_r) |