[4/8] Y2038: add function __gmtime64

Message ID 20181121002844.14530-5-albert.aribaud@3adev.fr
State Superseded
Headers show
Series
  • Y2038 struct tm related patches
Related show

Commit Message

Albert ARIBAUD (3ADEV) Nov. 21, 2018, 12:28 a.m.
* include/time.h
	(__gmtime64): Add.
	* time/gmtime.c
	(__gmtime64): Add.
	(__gmtime): Compile only if __TIMERSIZE != 64.
---
 include/time.h |  4 ++++
 time/gmtime.c  | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

-- 
2.17.1

Patch

diff --git a/include/time.h b/include/time.h
index 34368295a9..553bf74828 100644
--- a/include/time.h
+++ b/include/time.h
@@ -78,6 +78,10 @@  extern struct tm *__gmtime_r (const time_t *__restrict __timer,
 			      struct tm *__restrict __tp);
 libc_hidden_proto (__gmtime_r)
 
+#if __TIMESIZE == 64
+# define __gmtime64 gmtime
+#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 bda09bc021..46db119e9c 100644
--- a/time/gmtime.c
+++ b/time/gmtime.c
@@ -25,13 +25,25 @@  __gmtime_r (const time_t *t, struct tm *tp)
 {
   return __tz_convert (*t, 0, tp);
 }
+
 libc_hidden_def (__gmtime_r)
 weak_alias (__gmtime_r, gmtime_r)
 
+/* Return the `struct tm' representation of *T in UTC.  */
+struct tm *
+__gmtime64 (const __time64_t *t)
+{
+  return __tz_convert (*t, 0, &_tmbuf);
+}
+
+/* Provide a 32-bit variant if needed */
+
+#if __TIMESIZE != 64
 
-/* Return the `struct tm' representation of *T in UTC.	*/
 struct tm *
 gmtime (const time_t *t)
 {
   return __tz_convert (*t, 0, &_tmbuf);
 }
+
+#endif