diff options
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/localtime.cc | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index da662b020..b0b87911d 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,9 @@ 2009-06-14 Christopher Faylor <me+cygwin@cgf.cx> + * localtime.cc (time2): Take a stab at fixing a compiler warning. + +2009-06-14 Christopher Faylor <me+cygwin@cgf.cx> + * fhandler.cc (fhandler_base::wait_overlapped): Honor nonblocking flag for writes. Don't reset event handle when we see a ERROR_IO_PENDING. diff --git a/winsup/cygwin/localtime.cc b/winsup/cygwin/localtime.cc index c65596124..738f1780e 100644 --- a/winsup/cygwin/localtime.cc +++ b/winsup/cygwin/localtime.cc @@ -2006,7 +2006,7 @@ time2(struct tm *tmp, void (*funcp) P((const time_t*, long, struct tm*)), t = time2sub(&tmp2, funcp, offset, okayp, true); if (*okayp) { - if (t + 3600 < t) /* Sanity check */ + if (tmp2.tm_sec + 3600 < t) /* Sanity check */ return WRONG; return t + 3600; } |