From: simonmar <unknown>
Date: Sun, 14 Jan 2001 15:36:04 +0000 (+0000)
Subject: [project @ 2001-01-14 15:36:04 by simonmar]
X-Git-Tag: Approximately_9120_patches~2913
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=7d9a34028d87e55c8983c75b8e2170365f379234;p=ghc-hetmet.git

[project @ 2001-01-14 15:36:04 by simonmar]
oops, fix a sign error that caused toClockTime to be wrong outside GMT.
---

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)
 
 -- -----------------------------------------------------------------------------