diff options
| author | Roland McGrath <roland@gnu.org> | 2003-12-31 23:58:57 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2003-12-31 23:58:57 +0000 |
| commit | 7683e1407806ece4c6927866587c3359ee247f7d (patch) | |
| tree | b4ecd2db31603a9cf3bb974362a17fd3ff98e193 /time/timegm.c | |
| parent | a4e2a16911ed9c0ed353ba81970324b8e6de7c1c (diff) | |
* time/mktime.c: (my_mktime_localtime_r):
Remove. All uses changed to __localtime_r.
(__localtime_r) [!defined _LIBC]: New macro. Include "time_r.h" to
get its implementation.
Fix compile-command to allow for TIME_R_POSIX.
* time/strftime.c (my_strftime_gmtime_r, my_strftime_localtime_r):
Remove. All uses changed to __localtime_r and __gmtime_r.
(__gmtime_r, __localtime_r) [!HAVE_TM_GMTOFF]: New macros.
Include "time_r.h" to get their implementations.
* time/timegm.c: Allow use in GNU applications outside glibc.
[defined HAVE_CONFIG_H]: Include <config.h>.
[!defined _LIBC]: Include "timegm.h", <time_r.h>.
Define __gmtime_r, and declare __mktime_internal.
(timegm): Define via a prototype, since we can safely assume C89 now.
Diffstat (limited to 'time/timegm.c')
| -rw-r--r-- | time/timegm.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/time/timegm.c b/time/timegm.c index 3a089664ca..bbc8c919ad 100644 --- a/time/timegm.c +++ b/time/timegm.c @@ -1,4 +1,6 @@ -/* Copyright (C) 1994, 1997 Free Software Foundation, Inc. +/* Convert UTC calendar time to simple time. Like mktime but assumes UTC. + + Copyright (C) 1994, 1997, 2003 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 @@ -16,11 +18,29 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <time.h> +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif + +#ifdef _LIBC +# include <time.h> +#else +# include "timegm.h" + +/* Portable standalone applications should supply a "time_r.h" that + declares a POSIX-compliant gmtime_r, for the benefit of older + implementations that lack gmtime_r or have a nonstandard one. + See the gnulib time_r module for one way to implement this. */ +# include <time_r.h> +# undef __gmtime_r +# define __gmtime_r gmtime_r +time_t __mktime_internal (struct tm *, + struct tm * (*) (time_t const *, struct tm *), + time_t *); +#endif time_t -timegm (tmp) - struct tm *const tmp; +timegm (struct tm *tmp) { static time_t gmtime_offset; tmp->tm_isdst = 0; |