aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--time/tzset.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f0862aedf..68c7a24dde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-09 Roland McGrath <roland@redhat.com>
+
+ * time/tzset.c (tzset_internal): Cap hour in POSIX $TZ rule format to
+ 24, not 23.
+
2004-01-29 Roland McGrath <roland@redhat.com>
* io/ftwtest-sh: Use $tmp consistently, not literal /tmp.
diff --git a/time/tzset.c b/time/tzset.c
index 6de96762e9..2274a38f59 100644
--- a/time/tzset.c
+++ b/time/tzset.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-2002, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1991-2002,2003,2004 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
@@ -241,7 +241,7 @@ tzset_internal (always)
break;
}
tz_rules[0].offset *= (min (ss, 59) + (min (mm, 59) * 60) +
- (min (hh, 23) * 60 * 60));
+ (min (hh, 24) * 60 * 60));
for (l = 0; l < 3; ++l)
{