From: simonmar <unknown>
Date: Tue, 31 Jul 2001 12:50:18 +0000 (+0000)
Subject: [project @ 2001-07-31 12:50:18 by simonmar]
X-Git-Tag: nhc98-1-18-release~1208
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=725c28706f699f4d8f27ad47015989a073582fcf;p=haskell-directory.git

[project @ 2001-07-31 12:50:18 by simonmar]
merge fptools/ghc/lib/std/CPUTime.hsc rev. 1.8
---

diff --git a/System/CPUTime.hsc b/System/CPUTime.hsc
index d672817..1323d91 100644
--- a/System/CPUTime.hsc
+++ b/System/CPUTime.hsc
@@ -8,7 +8,7 @@
 -- Stability   :  provisional
 -- Portability :  portable
 --
--- $Id: CPUTime.hsc,v 1.2 2001/06/29 09:44:03 simonmar Exp $
+-- $Id: CPUTime.hsc,v 1.3 2001/07/31 12:50:18 simonmar Exp $
 --
 -- The standard CPUTime library.
 --
@@ -41,7 +41,7 @@ import Data.Ratio
 getCPUTime :: IO Integer
 getCPUTime = do
 
-#ifndef _WIN32
+#if !defined(mingw32_TARGET_OS) && !defined(cygwin32_TARGET_OS)
 -- getrusage() is right royal pain to deal with when targetting multiple
 -- versions of Solaris, since some versions supply it in libc (2.3 and 2.5),
 -- while 2.4 has got it in libucb (I wouldn't be too surprised if it was back
@@ -85,7 +85,7 @@ foreign import unsafe times :: Ptr CTms -> CClock
 # endif
 #endif
 
-#else /* _WIN32 */
+#else /* win32 */
     allocaBytes (#const sizeof(FILETIME)) $ \ p_creationTime -> do
     allocaBytes (#const sizeof(FILETIME)) $ \ p_exitTime -> do
     allocaBytes (#const sizeof(FILETIME)) $ \ p_kernelTime -> do