This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.17-390-g54206aa
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 13 Mar 2013 01:54:12 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.17-390-g54206aa
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 54206aa6a2729c0bfe10321c6d74c441bef36223 (commit)
from e98cdb38ee2dfd6ea9dc0fc07b5fa56421387964 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=54206aa6a2729c0bfe10321c6d74c441bef36223
commit 54206aa6a2729c0bfe10321c6d74c441bef36223
Author: Joseph Myers <joseph@codesourcery.com>
Date: Wed Mar 13 01:54:00 2013 +0000
Update zic from tzcode 2013b.
diff --git a/ChangeLog b/ChangeLog
index 2be9ceb..2cb0ed6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-13 Joseph Myers <joseph@codesourcery.com>
+
+ * timezone/zic.c: Update from tzcode 2013b.
+
2013-03-12 Carlos O'Donell <carlos@redhat.com>
* manual/install.texi (Configuring and compiling):
diff --git a/timezone/zic.c b/timezone/zic.c
index a5202a1..91f0d20 100644
--- a/timezone/zic.c
+++ b/timezone/zic.c
@@ -1748,7 +1748,7 @@ stringoffset(char *result, long offset)
minutes = offset % MINSPERHOUR;
offset /= MINSPERHOUR;
hours = offset;
- if (hours >= HOURSPERDAY) {
+ if (hours > HOURSPERDAY) {
result[0] = '\0';
return -1;
}
@@ -1851,7 +1851,9 @@ stringzone(char *result, const struct zone *const zpfirst, const int zonecount)
rp = &zp->z_rules[i];
if (stdrp == NULL || rp->r_hiyear > stdrp->r_hiyear ||
(rp->r_hiyear == stdrp->r_hiyear &&
- rp->r_month > stdrp->r_month))
+ (rp->r_month > stdrp->r_month ||
+ (rp->r_month == stdrp->r_month &&
+ rp->r_dayofmonth > stdrp->r_dayofmonth))))
stdrp = rp;
}
if (stdrp != NULL && stdrp->r_stdoff != 0)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
timezone/zic.c | 6 ++++--
2 files changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
GNU C Library master sources