Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/5e2a959dbafc2628963ac0aaf0b9b77742b8d6e3

>---------------------------------------------------------------

commit 5e2a959dbafc2628963ac0aaf0b9b77742b8d6e3
Author: Ian Lynagh <[email protected]>
Date:   Fri Nov 25 22:36:50 2011 +0000

    Simplify some CPP

>---------------------------------------------------------------

 System/CPUTime.hsc |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/System/CPUTime.hsc b/System/CPUTime.hsc
index 0b56329..e98234f 100644
--- a/System/CPUTime.hsc
+++ b/System/CPUTime.hsc
@@ -112,8 +112,7 @@ getCPUTime = do
 
 type CRUsage = ()
 foreign import ccall unsafe getrusage :: CInt -> Ptr CRUsage -> IO CInt
-#else
-# if defined(HAVE_TIMES)
+#elif defined(HAVE_TIMES)
     allocaBytes (#const sizeof(struct tms)) $ \ p_tms -> do
     _ <- times p_tms
     u_ticks  <- (#peek struct tms,tms_utime) p_tms :: IO CClock
@@ -123,12 +122,11 @@ foreign import ccall unsafe getrusage :: CInt -> Ptr 
CRUsage -> IO CInt
 
 type CTms = ()
 foreign import ccall unsafe times :: Ptr CTms -> IO CClock
-# else
+#else
     ioException (IOError Nothing UnsupportedOperation 
                          "getCPUTime"
                          "can't get CPU time"
                          Nothing)
-# endif
 #endif
 
 #else /* win32 */



_______________________________________________
Cvs-libraries mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-libraries

Reply via email to