From: Simon Marlow Date: Fri, 10 Mar 2006 11:45:32 +0000 (+0000) Subject: addToClockTime: handle picoseconds properly X-Git-Tag: directory_2007-05-24~328 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=bd5643389d3739fed4042454a61c0f73a54d2c89;p=haskell-directory.git addToClockTime: handle picoseconds properly fixes #588 --- diff --git a/System/Time.hsc b/System/Time.hsc index ff10ffc..f230e97 100644 --- a/System/Time.hsc +++ b/System/Time.hsc @@ -270,8 +270,8 @@ addToClockTime (TimeDiff year mon day hour min sec psec) 60 * toInteger min + 3600 * toInteger hour + 24 * 3600 * toInteger day - cal = toUTCTime (TOD (c_sec + sec_diff) (c_psec + psec)) - -- FIXME! ^^^^ + (d_sec, d_psec) = (c_psec + psec) `quotRem` 1000000000000 + cal = toUTCTime (TOD (c_sec + sec_diff + d_sec) d_psec) new_mon = fromEnum (ctMonth cal) + r_mon month' = fst tmp yr_diff = snd tmp