[PATCH 5/8] Y2038: add function __gmtime64_r

[Albert ARIBAUD (3ADEV)]

	* include/time.h
	(__gmtime64_r): Add.
	* time/gmtime.c
	(__gmtime64_r): Add.
	(__gmtime): Compile only if __TIMERSIZE != 64.
---
 include/time.h |  7 +++++++
 time/gmtime.c  | 15 +++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/include/time.h b/include/time.h
index 553bf74828..80543e3673 100644
--- a/include/time.h
+++ b/include/time.h
@@ -82,6 +82,13 @@ libc_hidden_proto (__gmtime_r)
 # define __gmtime64 gmtime
 #endif
 
+#if __TIMESIZE == 64
+# define __gmtime64_r __gmtime_r
+#else
+extern struct tm *__gmtime64_r (const __time64_t *__restrict __timer,
+				struct tm *__restrict __tp);
+#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 46db119e9c..4674ffe01e 100644
--- a/time/gmtime.c
+++ b/time/gmtime.c
@@ -20,12 +20,27 @@
 
 /* Return the `struct tm' representation of *T in UTC,
    using *TP to store the result.  */
+struct tm *
+__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
+
 struct tm *
 __gmtime_r (const time_t *t, struct tm *tp)
 {
   return __tz_convert (*t, 0, tp);
 }
 
+#endif
+
+/* This always works because either __TIMESIZE != 64 and __gmtime_r exists
+   or __TIMESIZE == 64 and the definition of __gmtime64_r above actually
+   defined __gmtime_r.  */
 libc_hidden_def (__gmtime_r)
 weak_alias (__gmtime_r, gmtime_r)
 
-- 
2.17.1