diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-07-16 09:53:45 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2008-07-16 09:53:45 +0000 |
| commit | c83494a925f4b4b716f9ba3abcb5e695d3e2a8a9 (patch) | |
| tree | d47fb1fa79c201c98e2fa7bb8dfeb6ed582beef0 /time | |
| parent | 1cb6b555a864f401c8a2ba75814e982b66a62971 (diff) | |
Updated to fedora-glibc-20080716T0944cvs/fedora-glibc-2_8_90-9
Diffstat (limited to 'time')
| -rw-r--r-- | time/mktime.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/time/mktime.c b/time/mktime.c index e299375a16..e47d69615a 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -1,5 +1,5 @@ /* Convert a `struct tm' to a time_t value. - Copyright (C) 1993-1999, 2002-2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2002-2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Eggert <eggert@twinsun.com>. @@ -293,7 +293,9 @@ __mktime_internal (struct tm *tp, int mday = tp->tm_mday; int mon = tp->tm_mon; int year_requested = tp->tm_year; - int isdst = tp->tm_isdst; + /* Normalize the value. */ + int isdst = ((tp->tm_isdst >> (8 * sizeof (tp->tm_isdst) - 1)) + | (tp->tm_isdst != 0)); /* 1 if the previous probe was DST. */ int dst2; |