From: simonmar <unknown>
Date: Tue, 31 Jul 2001 13:05:02 +0000 (+0000)
Subject: [project @ 2001-07-31 13:05:02 by simonmar]
X-Git-Tag: nhc98-1-18-release~1201
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=bf8f7711f2003c09ae4309a7fd2823ebb6352cbc;p=ghc-base.git

[project @ 2001-07-31 13:05:02 by simonmar]
merge ghc/lib/std/Time.hsc rev. 1.17
---

diff --git a/System/Time.hsc b/System/Time.hsc
index b8d79b4..6cb2590 100644
--- a/System/Time.hsc
+++ b/System/Time.hsc
@@ -11,7 +11,7 @@
 -- Stability   :  provisional
 -- Portability :  portable
 --
--- $Id: Time.hsc,v 1.1 2001/06/28 14:15:04 simonmar Exp $
+-- $Id: Time.hsc,v 1.2 2001/07/31 13:05:02 simonmar Exp $
 --
 -- The standard Time library.
 --
@@ -208,8 +208,8 @@ noTimeDiff = TimeDiff 0 0 0 0 0 0 0
 getClockTime = do
   allocaBytes (#const sizeof(struct timeval)) $ \ p_timeval -> do
     throwErrnoIfMinus1_ "getClockTime" $ gettimeofday p_timeval nullPtr
-    sec  <- (#peek struct timeval,tv_sec)  p_timeval :: IO CLong
-    usec <- (#peek struct timeval,tv_usec) p_timeval :: IO CLong
+    sec  <- (#peek struct timeval,tv_sec)  p_timeval :: IO Int32
+    usec <- (#peek struct timeval,tv_usec) p_timeval :: IO Int32
     return (TOD (fromIntegral sec) ((fromIntegral usec) * 1000))
  
 #elif HAVE_FTIME