AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-18 06:30:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update

Browse Source 
* lib/mktime.c (__mktime_internal): Work around bug in Irix4.0.5's
	C compiler.  From Kaveh Ghazi.
	(TYPE_MINIMUM): Define.
	(TYPE_MAXIMUM): Define.
	(TIME_T_MIN): Use TYPE_MINIMUM.
	(TIME_T_MAX): Use TYPE_MAXIMUM.
	Patch by Jim Meyering <meyering@ascend.com>.
This commit is contained in:
Ulrich Drepper 1998-01-24 02:44:44 +00:00
parent 699171a27f
commit 1dfee75f84
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -2,6 +2,14 @@
* nis/nislib/nislib.h: Removed. * nis/nislib/nislib.h: Removed.
* lib/mktime.c (__mktime_internal): Work around bug in Irix4.0.5's
C compiler. From Kaveh Ghazi.
(TYPE_MINIMUM): Define.
(TYPE_MAXIMUM): Define.
(TIME_T_MIN): Use TYPE_MINIMUM.
(TIME_T_MAX): Use TYPE_MAXIMUM.
Patch by Jim Meyering <meyering@ascend.com>.
1998-01-22 00:55 Ulrich Drepper <drepper@happy.cygnus.com> 1998-01-22 00:55 Ulrich Drepper <drepper@happy.cygnus.com>
* libc.map: Add __libc_uid, __libc_pid, __syscall_rt_sigqueueinfo, * libc.map: Add __libc_uid, __libc_pid, __syscall_rt_sigqueueinfo,

33
time/mktime.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. /* Copyright (C) 1993, 94, 95, 96, 97, 98 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Paul Eggert (eggert@twinsun.com). Contributed by Paul Eggert (eggert@twinsun.com).
@ -25,7 +25,7 @@
# include <config.h> # include <config.h>
#endif #endif
/* Some hosts need this in order to declare localtime_r properly. */ /* Some systems need this in order to declare localtime_r properly. */
#ifndef _REENTRANT #ifndef _REENTRANT
# define _REENTRANT 1 # define _REENTRANT 1
#endif #endif
@ -71,21 +71,26 @@
# define CHAR_BIT 8 # define CHAR_BIT 8
#endif #endif
/* The extra casts work around common compiler bugs. */
#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
/* The outer cast is needed to work around a bug in Cray C 5.0.3.0.
It is necessary at least when t == time_t. */
#define TYPE_MINIMUM(t) ((t) (TYPE_SIGNED (t) \
? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0))
#define TYPE_MAXIMUM(t) (~ (t) 0 - TYPE_MINIMUM (t))
#ifndef INT_MIN #ifndef INT_MIN
# define INT_MIN (~0 << (sizeof (int) * CHAR_BIT - 1)) # define INT_MIN TYPE_MINIMUM (int)
#endif #endif
#ifndef INT_MAX #ifndef INT_MAX
# define INT_MAX (~0 - INT_MIN) # define INT_MAX TYPE_MAXIMUM (int)
#endif #endif
#ifndef TIME_T_MIN #ifndef TIME_T_MIN
/* The outer cast to time_t works around a bug in Cray C 5.0.3.0. */ # define TIME_T_MIN TYPE_MINIMUM (time_t)
# define TIME_T_MIN ((time_t) \
(0 < (time_t) -1 ? (time_t) 0 \
: ~ (time_t) 0 << (sizeof (time_t) * CHAR_BIT - 1)))
#endif #endif
#ifndef TIME_T_MAX #ifndef TIME_T_MAX
# define TIME_T_MAX (~ (time_t) 0 - TIME_T_MIN) # define TIME_T_MAX TYPE_MAXIMUM (time_t)
#endif #endif
#define TM_YEAR_BASE 1900 #define TM_YEAR_BASE 1900
@ -363,7 +368,15 @@ __mktime_internal (tp, convert, offset)
double dday = 366 * dyear + mday; double dday = 366 * dyear + mday;
double dsec = 60 * (60 * (24 * dday + hour) + min) + sec_requested; double dsec = 60 * (60 * (24 * dday + hour) + min) + sec_requested;
if (TIME_T_MAX / 3 - TIME_T_MIN / 3 < (dsec < 0 ? - dsec : dsec)) /* On Irix4.0.5 cc, dividing TIME_T_MIN by 3 does not produce
correct results, ie., it erroneously gives a positive value
of 715827882. Setting a variable first then doing math on it
seems to work. (ghazi@caip.rutgers.edu) */
const time_t time_t_max = TIME_T_MAX;
const time_t time_t_min = TIME_T_MIN;
if (time_t_max / 3 - time_t_min / 3 < (dsec < 0 ? - dsec : dsec))
return -1; return -1;
} }