summaryrefslogtreecommitdiff
path: root/time/gmtime.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-09-18 19:00:32 +0000
committerRoland McGrath <roland@gnu.org>1995-09-18 19:00:32 +0000
commitc22164805d6fed3359e7f606c02974ae53d5e3de (patch)
tree90275c9f8c053c60c4a88d28f8692e67d2dbbefa /time/gmtime.c
parentaa9109070f2919ab519de474e00274c9fff5dcff (diff)
Mon Sep 18 12:39:22 1995 Paul Eggert <eggert@twinsun.com>
* mktime.c (localtime_r): Add substitute if the system doesn't provide one. Mon Sep 18 14:39:20 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> * time/gmtime.c (gmtime_r): Define as weak alias. * time/localtime.c (localtime_r): Define as weak alias. * time/time.h [__USE_REENTRANT] (gmtime_r, localtime_r): Declare them. * errno.h: Only define _ERRNO_H #ifndef __need_Emath. #undef __need_Emath after including errnos.h. [_ERRNO_H]: Protect decls with this. Sun Sep 17 08:22:12 1995 Paul Eggert <eggert@twinsun.com> Fix mktime so that it does not write over localtime's returned value. * localtime.c (__localtime_r): New function, with extra arg specifying where to store result. (localtime): Use it. (_tmbuf): New var. * gmtime.c (__gmtime_r, gmtime, _tmbuf): Likewise. * mktime.c (__mktime_internal): Conversion function is now __localtime_r style, not localtime style. (mktime): Pass __localtime_r, not localtime. * timegm.c (timegm): Pass __gmtime_r, not gmtime. * offtime.c (__offtime): New arg specifying where to store result. * time.h (__mktime_internal, __offtime): Adjust decls accordingly. (__gmtime_r, __localtime_r): New decls. * time/localtime.c: <stddef.h>, <ctype.h>, <stdio.h>, <stdlib.h>, <string.h>: Remove includes. <errno.h>: Add include. * time/mktime.c, time/time.h, time/timegm.c (__mktime_internal): Renamed from _mktime_internal to avoid namespace pollution. * time/gmtime.c: Clear tm_isdst. * misc/efgcvt_r.c (ecvt_r, fcvt_r): Last arg is size_t, not int. * stdlib/stdlib.h (ecvt_r, fcvt_r): Fix type of last arg: make it size_t. * sysdeps/mach/hurd/fpathconf.c: Call __io_pathconf instead of __file_pathconf. * sysdeps/mach/hurd/pathconf.c: Likewise.
Diffstat (limited to 'time/gmtime.c')
-rw-r--r--time/gmtime.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/time/gmtime.c b/time/gmtime.c
index f09baef5f2..93fba659be 100644
--- a/time/gmtime.c
+++ b/time/gmtime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1993, 1995 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -20,14 +20,28 @@ Cambridge, MA 02139, USA. */
#include <stddef.h>
#include <time.h>
+/* Defined in localtime.c. */
+extern struct tm _tmbuf;
+
/* Return the `struct tm' representation of *T in UTC. */
struct tm *
DEFUN(gmtime, (t), CONST time_t *t)
{
- struct tm *tp = __offtime (t, 0L);
+ return __gmtime_r (t, &_tmbuf);
+}
+
+/* Return the `struct tm' representation of *T in UTC,
+ using *TP to store the result. */
+struct tm *
+DEFUN(__gmtime_r, (t, tp),
+ CONST time_t *t AND struct tm *tp)
+{
+ __offtime (t, 0L, tp);
+ tp->tm_isdst = 0;
tp->tm_gmtoff = 0L;
tp->tm_zone = "GMT";
return tp;
}
+weak_alias (__gmtime_r, gmtime_r)