From b78ad5fd49ddfbe2e74aa6f00afbe992399c0efe Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 2 Dec 2004 22:16:35 +0000 Subject: * time/mktime.c (__mktime_internal): If SEC_REQUESTED != SEC, convert T2, not T. * time/Makefile (tests): Add tst-mktime3. * time/tst-mktime3.c: New test. 2004-12-01 Jakub Jelinek --- time/mktime.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'time/mktime.c') diff --git a/time/mktime.c b/time/mktime.c index 280f5f47d5..c6ae56ee60 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -463,8 +463,9 @@ __mktime_internal (struct tm *tp, t2 = t1 + sec_adjustment; if (((t1 < t) != (sec_requested < 0)) | ((t2 < t1) != (sec_adjustment < 0)) - | ! (*convert) (&t, &tm)) + | ! (*convert) (&t2, &tm)) return -1; + t = t2; } *tp = tm; -- cgit 1.4.1