X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2FTime.hsc;h=dc7077dc7c7dbfe22b8eb3bfc8188e9b55316992;hb=7d9a34028d87e55c8983c75b8e2170365f379234;hp=9619d772c74a6984f95f04faa0e7bfab9719b309;hpb=eff1890b909ea5388d4015c9848f97ffafe8ac9d;p=ghc-hetmet.git diff --git a/ghc/lib/std/Time.hsc b/ghc/lib/std/Time.hsc index 9619d77..dc7077d 100644 --- a/ghc/lib/std/Time.hsc +++ b/ghc/lib/std/Time.hsc @@ -1,5 +1,5 @@ -- ----------------------------------------------------------------------------- --- $Id: Time.hsc,v 1.4 2001/01/12 17:04:00 simonmar Exp $ +-- $Id: Time.hsc,v 1.5 2001/01/14 15:36:04 simonmar Exp $ -- -- (c) The University of Glasgow, 1995-2001 -- @@ -468,7 +468,7 @@ toClockTime (CalendarTime year mon mday hour min sec psec -- result. -- gmtoff <- gmtoff p_tm - let res = fromIntegral t + tz + fromIntegral gmtoff + let res = fromIntegral t + tz - fromIntegral gmtoff return (TOD (fromIntegral res) 0) -- -----------------------------------------------------------------------------