From: ross Date: Thu, 16 Jan 2003 14:38:40 +0000 (+0000) Subject: [project @ 2003-01-16 14:38:40 by ross] X-Git-Tag: nhc98-1-18-release~760 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=944dee93e3d71dd0827615061dec78ac975188e4;p=ghc-base.git [project @ 2003-01-16 14:38:40 by ross] remove spurious #ifdef __HUGS__ --- diff --git a/GHC/Exception.lhs b/GHC/Exception.lhs index 3e26cdc..a98ca19 100644 --- a/GHC/Exception.lhs +++ b/GHC/Exception.lhs @@ -14,7 +14,6 @@ -- ----------------------------------------------------------------------------- -#ifndef __HUGS__ module GHC.Exception ( module GHC.Exception, Exception(..), AsyncException(..), @@ -24,8 +23,6 @@ module GHC.Exception import GHC.Base import GHC.IOBase - -#endif \end{code} %********************************************************* @@ -48,11 +45,7 @@ have to work around that in the definition of catchException below). \begin{code} catchException :: IO a -> (Exception -> IO a) -> IO a -#ifdef __HUGS__ -catchException m k = ST (\s -> unST m s `primCatch'` \ err -> unST (k err) s) -#else catchException (IO m) k = IO $ \s -> catch# m (\ex -> unIO (k ex)) s -#endif catch :: IO a -> (IOError -> IO a) -> IO a catch m k = catchException m handler @@ -85,13 +78,8 @@ block :: IO a -> IO a -- be disabled again. unblock :: IO a -> IO a -#ifndef __HUGS__ block (IO io) = IO $ blockAsyncExceptions# io unblock (IO io) = IO $ unblockAsyncExceptions# io -#else -unblock :: IO a -> IO a -unblock (IO io) = IO io -#endif \end{code}