diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-12-12 20:28:46 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-12-12 20:28:46 +0000 |
| commit | 1716edfc192b29f8cec407e3eebfbe84e28f70e4 (patch) | |
| tree | fe6618670f8f6469186eca108fc944d3317d83aa /time | |
| parent | 574e283890a6ca92325a06dafa76ff307a8019a2 (diff) | |
| download | glibc-1716edfc192b29f8cec407e3eebfbe84e28f70e4.zip glibc-1716edfc192b29f8cec407e3eebfbe84e28f70e4.tar.gz glibc-1716edfc192b29f8cec407e3eebfbe84e28f70e4.tar.bz2 | |
Updated to fedora-glibc-20071212T1953
Diffstat (limited to 'time')
| -rw-r--r-- | time/bug-getdate1.c | 6 | ||||
| -rw-r--r-- | time/mktime.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/time/bug-getdate1.c b/time/bug-getdate1.c index 7da88f4..3d68cf2 100644 --- a/time/bug-getdate1.c +++ b/time/bug-getdate1.c @@ -115,13 +115,13 @@ do_test (int argc, char *argv[]) res |= process_getdate_on ("25 3"); output_to_template_file ("%C"); - res |= process_getdate_on ("98"); + res |= process_getdate_on ("20"); output_to_template_file ("%C %y %m"); - res |= process_getdate_on ("98 3 2"); + res |= process_getdate_on ("20 3 2"); output_to_template_file ("%C %y"); - res |= process_getdate_on ("21 5"); + res |= process_getdate_on ("20 5"); /* * The following testcase reproduces the problem: diff --git a/time/mktime.c b/time/mktime.c index 8f00c72..e299375 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-2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2002-2006, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Eggert <eggert@twinsun.com>. @@ -372,7 +372,7 @@ __mktime_internal (struct tm *tp, int diff = approx_biennia - approx_requested_biennia; int abs_diff = diff < 0 ? - diff : diff; - /* IRIX 4.0.5 cc miscaculates TIME_T_MIN / 3: it erroneously + /* IRIX 4.0.5 cc miscalculates TIME_T_MIN / 3: it erroneously gives a positive value of 715827882. Setting a variable first then doing math on it seems to work. (ghazi@caip.rutgers.edu) */ |