diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-02-02 01:50:11 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-02-02 01:50:11 +0000 |
| commit | c0e4567461c09ba47ddbc20e6b0ab09bdb0237ab (patch) | |
| tree | 98b750550281f12a6b1d8573c5038a4c9d44abc6 /time/mktime.c | |
| parent | 19361cb768c280e47f2ca69ed63e1d75f332e592 (diff) | |
update from main archive 970201cvs/libc-970202
1997-02-02 00:39 Ulrich Drepper <drepper@cygnus.com>
* dirent/dirent.h: Add description _DIRENT_HAVE_D_TYPE.
1997-02-01 17:04 Philip Blundell <pjb27@cam.ac.uk>
* inet/netinet/ip.h (MAX_IPOPTLEN): Add definition.
1997-02-01 17:00 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/socketbits.h: Add definition of cmsghdr
structure plus related macros.
* sysdeps/unix/sysv/linux/cmsg_nxthdr.c: New file.
* sysdeps/unix/sysv/linux/Makefile [$(subdir)=socket]
(sysdep_routines): Add cmsg_nxthdr.
* sysdeps/unix/sysv/linux/Dist: Add cmsg_nxthdr.c.
Suggested by Philip Blundell <pjb27@cam.ac.uk>.
1997-02-01 12:34 Ulrich Drepper <drepper@cygnus.com>
* time/strftime.c: Define _strftime_copytm without protecting arguments
which breaks the definition.
1997-02-01 03:31 Thorsten Kukuk <kukuk@weber.uni-paderborn.de>
* nis/rpcsvc/yp_prot.h: Move definition of yppushresp_xfr after
definition of type for element.
1997-02-01 03:28 Philip Blundell <pjb27@cam.ac.uk>
* sydsdeps/unix/sysv/linux/netinet/in.h: Add IPv6 related IPPROTO_*
constants.
1997-02-01 03:09 H.J. Lu <hjl@lucon.org>
* Makefile: Pass PARALLELMFLAGS to sub-makes.
* Makefile.in: Mention PARALLELMFLAGS and pass to main Makefile.
1997-01-31 Paul Eggert <eggert@twinsun.com>
* time/mktime.c (HAVE_LIMITS_H, HAVE_LOCALTIME_R, STDC_HEADERS):
Define if _LIBC is defined.
<limits.h>: Include if HAVE_LIMITS_H instead of if
__STDC__ || __GNU_LIBRARY__ || STDC_HEADERS.
<stdlib.h>: Similarly, include if STDC_HEADERS.
(localtime_r): Redo #ifdef to make it clear that glibc has
localtime_r now.
1997-02-29 20:08 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sunrpc/Makefile ($(objpfx)rpcsvc/%.h, $(objpfx)x%.c): Use stamp
file to avoid unnecessary recompilation.
1997-01-29 19:33 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makefile: Set install-others, not install_others.
(before-compile): Use += to preserve previous value.
($(inst_includedir)/gnu/lib-names.h): Remove obsolete comment and
fix dependency name.
($(objpfx)lib-names.h): Remove rule.
* Makeconfig ($(common-objpfx)gnu/lib-names.h): Generate it here,
with correct name, using an intermediate stamp file.
(common-generated): Add gnu/lib-names.h.
(before-compile): Add $(common-objpfx)gnu/lib-names.h.
1997-01-30 18:29 Richard Henderson <richard@atheist.tamu.edu>
* malloc/malloc.c (MAGICBYTE): Use cast to size_t instead of unsigned
to prevent warnings on 64 bit systems.
Reported by Paul Wouters <paul@xtdnet.nl>.
* sysdeps/alpha/dl-machine.h: Revert check for broken gas. By default
we assume it works.
Diffstat (limited to 'time/mktime.c')
| -rw-r--r-- | time/mktime.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/time/mktime.c b/time/mktime.c index fd242b1545..d8fdf3a6c6 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -25,6 +25,12 @@ #include <config.h> #endif +#ifdef _LIBC +# define HAVE_LIMITS_H 1 +# define HAVE_LOCALTIME_R 1 +# define STDC_HEADERS 1 +#endif + /* Assume that leap seconds are possible, unless told otherwise. If the host has a `zic' command with a `-L leapsecondfilename' option, then it supports leap seconds; otherwise it probably doesn't. */ @@ -35,13 +41,13 @@ #include <sys/types.h> /* Some systems define `time_t' here. */ #include <time.h> -#if __STDC__ || __GNU_LIBRARY__ || STDC_HEADERS +#if HAVE_LIMITS_H #include <limits.h> #endif #if DEBUG #include <stdio.h> -#if __STDC__ || __GNU_LIBRARY__ || STDC_HEADERS +#if STDC_HEADERS #include <stdlib.h> #endif /* Make it work even if the system's libc has its own mktime routine. */ @@ -100,10 +106,10 @@ time_t __mktime_internal __P ((struct tm *, time_t *)); -#if ! HAVE_LOCALTIME_R && ! defined (localtime_r) #ifdef _LIBC #define localtime_r __localtime_r #else +#if ! HAVE_LOCALTIME_R && ! defined (localtime_r) /* Approximate localtime_r as best we can in its absence. */ #define localtime_r my_localtime_r static struct tm *localtime_r __P ((const time_t *, struct tm *)); @@ -118,8 +124,8 @@ localtime_r (t, tp) *tp = *l; return tp; } -#endif /* ! _LIBC */ #endif /* ! HAVE_LOCALTIME_R && ! defined (localtime_r) */ +#endif /* ! _LIBC */ /* Yield the difference between (YEAR-YDAY HOUR:MIN:SEC) and (*TP), |