diff options
author | Roland McGrath <roland@gnu.org> | 1995-09-18 19:00:32 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1995-09-18 19:00:32 +0000 |
commit | c22164805d6fed3359e7f606c02974ae53d5e3de (patch) | |
tree | 90275c9f8c053c60c4a88d28f8692e67d2dbbefa /time/time.h | |
parent | aa9109070f2919ab519de474e00274c9fff5dcff (diff) | |
download | glibc-c22164805d6fed3359e7f606c02974ae53d5e3de.tar.gz glibc-c22164805d6fed3359e7f606c02974ae53d5e3de.tar.xz glibc-c22164805d6fed3359e7f606c02974ae53d5e3de.zip |
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/time.h')
-rw-r--r-- | time/time.h | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/time/time.h b/time/time.h index 7070881949..6d52e943eb 100644 --- a/time/time.h +++ b/time/time.h @@ -111,8 +111,9 @@ extern time_t mktime __P ((struct tm *__tp)); /* Subroutine of `mktime'. Return the `time_t' representation of TP and normalize TP, given that a `struct tm *' maps to a `time_t' as performed by FUNC. */ -extern time_t _mktime_internal __P ((struct tm *__tp, - struct tm *(*__func) (const time_t *))); +extern time_t __mktime_internal __P ((struct tm *__tp, + struct tm *(*__func) (const time_t *, + struct tm *))); /* Format TP into S according to FORMAT. @@ -130,10 +131,28 @@ extern struct tm *gmtime __P ((__const time_t *__timer)); of *TIMER in the local timezone. */ extern struct tm *localtime __P ((__const time_t *__timer)); -/* Return the `struct tm' representation of *TIMER, - offset OFFSET seconds east of Universal Coordinated Time. */ -extern struct tm *__offtime __P ((__const time_t *__timer, - long int __offset)); +#ifdef __USE_REENTRANT +/* Return the `struct tm' representation of *TIMER in UTC, + using *TP to store the result. */ +extern struct tm *__gmtime_r __P ((__const time_t *__timer, + struct tm *__tp)); +extern struct tm *gmtime_r __P ((__const time_t *__timer, + struct tm *__tp)); + +/* Return the `struct tm' representation of *TIMER in local time, + using *TP to store the result. */ +extern struct tm *__localtime_r __P ((__const time_t *__timer, + struct tm *__tp)); +extern struct tm *localtime_r __P ((__const time_t *__timer, + struct tm *__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. */ +extern void __offtime __P ((__const time_t *__timer, + long int __offset, + struct tm *__TP)); /* Return a string of the form "Day Mon dd hh:mm:ss yyyy\n" that is the representation of TP in this format. */ |