From patchwork Wed Nov 21 00:28:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert ARIBAUD X-Patchwork-Id: 30231 Received: (qmail 59380 invoked by alias); 21 Nov 2018 00:28:57 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 59255 invoked by uid 89); 21 Nov 2018 00:28:56 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=2525 X-HELO: smtpfb2-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Subject: [PATCH 4/8] Y2038: add function __gmtime64 Date: Wed, 21 Nov 2018 01:28:40 +0100 Message-Id: <20181121002844.14530-5-albert.aribaud@3adev.fr> In-Reply-To: <20181121002844.14530-1-albert.aribaud@3adev.fr> References: <20181121002844.14530-1-albert.aribaud@3adev.fr> * 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(-) 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