diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/time.h | 7 | ||||
| -rw-r--r-- | time/ctime.c | 19 |
3 files changed, 30 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 5dfc488554..9b345fad4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ 2018-12-18 Albert ARIBAUD <albert.aribaud@3adev.fr> * include/time.h + (__ctime64): Add. + * time/gmtime.c + (__ctime64): Add. + [__TIMESIZE != 64] (ctime): Turn into a wrapper. + + * include/time.h (__gmtime64_r): Add. * time/gmtime.c (__gmtime64_r): Add. diff --git a/include/time.h b/include/time.h index fb93d647d8..34d9de126b 100644 --- a/include/time.h +++ b/include/time.h @@ -58,6 +58,13 @@ extern time_t __mktime_internal (struct tm *__tp, long int *__offset) attribute_hidden; #if __TIMESIZE == 64 +# define __ctime64 ctime +#else +extern char *__ctime64 (const __time64_t *__timer) __THROW; +libc_hidden_proto (__ctime64); +#endif + +#if __TIMESIZE == 64 # define __localtime64 localtime #else extern struct tm *__localtime64 (const __time64_t *__timer); diff --git a/time/ctime.c b/time/ctime.c index 1222614f29..7925662a0a 100644 --- a/time/ctime.c +++ b/time/ctime.c @@ -20,9 +20,24 @@ /* Return a string as returned by asctime which is the representation of *T in that form. */ char * -ctime (const time_t *t) +__ctime64 (const __time64_t *t) { /* The C Standard says ctime (t) is equivalent to asctime (localtime (t)). In particular, ctime and asctime must yield the same pointer. */ - return asctime (localtime (t)); + return asctime (__localtime64 (t)); +} + +/* Provide a 32-bit variant if needed. */ + +#if __TIMESIZE != 64 + +libc_hidden_def (__ctime64) + +char * +ctime (const time_t *t) +{ + __time64_t t64 = *t; + return __ctime64 (&t64); } + +#endif |