From 2c19d1a0efd17ab30b773ec3fd88f212af8317b6 Mon Sep 17 00:00:00 2001 From: simonmar Date: Wed, 24 Apr 2002 16:03:39 +0000 Subject: [PATCH] [project @ 2002-04-24 16:01:51 by simonmar] Update foreign import syntax --- Debug/Trace.hs | 4 ++-- System/CPUTime.hsc | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Debug/Trace.hs b/Debug/Trace.hs index d5a012a..993a72e 100644 --- a/Debug/Trace.hs +++ b/Debug/Trace.hs @@ -8,7 +8,7 @@ -- Stability : provisional -- Portability : portable -- --- $Id: Trace.hs,v 1.1 2001/06/28 14:15:02 simonmar Exp $ +-- $Id: Trace.hs,v 1.2 2002/04/24 16:01:51 simonmar Exp $ -- -- The trace function. -- @@ -37,5 +37,5 @@ trace string expr = unsafePerformIO $ do postTraceHook fd return expr -foreign import "PostTraceHook" postTraceHook :: Int -> IO () +foreign import ccall "PostTraceHook" postTraceHook :: Int -> IO () #endif diff --git a/System/CPUTime.hsc b/System/CPUTime.hsc index a227b24..25098fe 100644 --- a/System/CPUTime.hsc +++ b/System/CPUTime.hsc @@ -8,7 +8,7 @@ -- Stability : provisional -- Portability : portable -- --- $Id: CPUTime.hsc,v 1.6 2002/02/11 12:29:13 simonmar Exp $ +-- $Id: CPUTime.hsc,v 1.7 2002/04/24 16:03:39 simonmar Exp $ -- -- The standard CPUTime library. -- @@ -65,7 +65,7 @@ getCPUTime = do * 1000000) type CRUsage = () -foreign import unsafe getrusage :: CInt -> Ptr CRUsage -> IO CInt +foreign import ccall unsafe getrusage :: CInt -> Ptr CRUsage -> IO CInt #else # if defined(HAVE_TIMES) allocaBytes (#const sizeof(struct tms)) $ \ p_tms -> do @@ -76,7 +76,7 @@ foreign import unsafe getrusage :: CInt -> Ptr CRUsage -> IO CInt `div` fromIntegral clockTicks) type CTms = () -foreign import unsafe times :: Ptr CTms -> IO CClock +foreign import ccall unsafe times :: Ptr CTms -> IO CClock # else ioException (IOError Nothing UnsupportedOperation "getCPUTime" @@ -108,8 +108,8 @@ foreign import unsafe times :: Ptr CTms -> IO CClock type FILETIME = () type HANDLE = () -- need proper Haskell names (initial lower-case character) -foreign import "GetCurrentProcess" unsafe getCurrentProcess :: IO (Ptr HANDLE) -foreign import "GetProcessTimes" unsafe getProcessTimes :: Ptr HANDLE -> Ptr FILETIME -> Ptr FILETIME -> Ptr FILETIME -> Ptr FILETIME -> IO CInt +foreign import ccall unsafe "GetCurrentProcess" getCurrentProcess :: IO (Ptr HANDLE) +foreign import ccall unsafe "GetProcessTimes" getProcessTimes :: Ptr HANDLE -> Ptr FILETIME -> Ptr FILETIME -> Ptr FILETIME -> Ptr FILETIME -> IO CInt #endif /* not _WIN32 */ @@ -122,5 +122,5 @@ clockTicks = (#const CLK_TCK) #else unsafePerformIO (sysconf (#const _SC_CLK_TCK) >>= return . fromIntegral) -foreign import unsafe sysconf :: CInt -> IO CLong +foreign import ccall unsafe sysconf :: CInt -> IO CLong #endif -- 1.7.10.4