diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/time.h | 8 | ||||
| -rw-r--r-- | time/ctime_r.c | 19 |
3 files changed, 31 insertions, 2 deletions
@@ -1,6 +1,12 @@ 2018-12-18 Albert ARIBAUD <albert.aribaud@3adev.fr> * include/time.h + (__ctime64_r): Add. + * time/ctime_r.c + (__ctime64_r): Add. + [__TIMESIZE != 64] (__ctime_r): Turn into a wrapper. + + * include/time.h (__ctime64): Add. * time/gmtime.c (__ctime64): Add. diff --git a/include/time.h b/include/time.h index 34d9de1..a10a59a 100644 --- a/include/time.h +++ b/include/time.h @@ -65,6 +65,14 @@ libc_hidden_proto (__ctime64); #endif #if __TIMESIZE == 64 +# define __ctime64_r ctime_r +#else +extern char *__ctime64_r (const __time64_t *__restrict __timer, + char *__restrict __buf) __THROW; +libc_hidden_proto (__ctime64_r); +#endif + +#if __TIMESIZE == 64 # define __localtime64 localtime #else extern struct tm *__localtime64 (const __time64_t *__timer); diff --git a/time/ctime_r.c b/time/ctime_r.c index c111146..38be678 100644 --- a/time/ctime_r.c +++ b/time/ctime_r.c @@ -22,8 +22,23 @@ /* Return a string as returned by asctime which is the representation of *T in that form. Reentrant version. */ char * -ctime_r (const time_t *t, char *buf) +__ctime64_r (const __time64_t *t, char *buf) { struct tm tm; - return __asctime_r (__localtime_r (t, &tm), buf); + return __asctime_r (__localtime64_r (t, &tm), buf); +} + +/* Provide a 32-bit variant if needed. */ + +#if __TIMESIZE != 64 + +libc_hidden_def (__ctime64_r) + +char * +ctime_r (const time_t *t, char *buf) +{ + __time64_t t64 = *t; + return __ctime64_r (&t64, buf); } + +#endif |