aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2011-08-26 07:23:42 +0000
committerCorinna Vinschen <corinna@vinschen.de>2011-08-26 07:23:42 +0000
commit477215fe7db5277f44fe35c5a600597bbf957fa0 (patch)
tree77358b06e048efa31c09d09fc07519aa0335fbbe
parent2691168e9847fd9b14b2bf4eaff597b6b19d593b (diff)
downloadnewlib-477215fe7db5277f44fe35c5a600597bbf957fa0.zip
newlib-477215fe7db5277f44fe35c5a600597bbf957fa0.tar.gz
newlib-477215fe7db5277f44fe35c5a600597bbf957fa0.tar.bz2
* libc/time/mktm_r.c (_mktm_r): Fix previous fix.
-rw-r--r--newlib/ChangeLog4
-rw-r--r--newlib/libc/time/mktm_r.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index b9fbc82..cdda0cf 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-26 Steven Abner <pheonix@zoomtown.com>
+
+ * libc/time/mktm_r.c (_mktm_r): Fix previous fix.
+
2011-08-24 Corinna Vinschen <vinschen@redhat.com>
* libc/time/mktm_r.c (_mktm_r): Fix computing tm_year.
diff --git a/newlib/libc/time/mktm_r.c b/newlib/libc/time/mktm_r.c
index 9b9b411..c0ab219 100644
--- a/newlib/libc/time/mktm_r.c
+++ b/newlib/libc/time/mktm_r.c
@@ -182,7 +182,7 @@ _DEFUN (_mktm_r, (tim_p, res, is_gmtime),
{
res->tm_mon = 11;
res->tm_year -= 1;
- res->tm_yday = 364 + isleap(res->tm_year);
+ res->tm_yday = 364 + isleap(res->tm_year + 1900);
}
res->tm_mday = ip[res->tm_mon];
}
@@ -254,4 +254,3 @@ _DEFUN (__tzcalc_limits, (year),
return 1;
}
-