From dd453e55924f18ad3ffba5e9555a2f65df391164 Mon Sep 17 00:00:00 2001 From: rrt Date: Mon, 2 Jul 2001 13:08:49 +0000 Subject: [PATCH] [project @ 2001-07-02 13:08:49 by rrt] Don't use _WIN32; use mingw32_TARGET_OS and cygwin32_TARGET_OS instead. --- ghc/lib/std/CPUTime.hsc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ghc/lib/std/CPUTime.hsc b/ghc/lib/std/CPUTime.hsc index 28a7c7d..2d0b4cb 100644 --- a/ghc/lib/std/CPUTime.hsc +++ b/ghc/lib/std/CPUTime.hsc @@ -1,5 +1,5 @@ -- ----------------------------------------------------------------------------- --- $Id: CPUTime.hsc,v 1.7 2001/06/28 16:44:18 rrt Exp $ +-- $Id: CPUTime.hsc,v 1.8 2001/07/02 13:08:49 rrt Exp $ -- -- (c) The University of Glasgow, 1995-2001 -- @@ -37,7 +37,7 @@ import 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 @@ -81,7 +81,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 -- 1.7.10.4