X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FHsVersions.h;h=f11aa214c416a667eae00ac55de5ff19addaf913;hb=311b1cdfc9b1c311cc53482c461c18cba8885b2a;hp=dd80922e0b3692e04b11581ab106212d07b4790e;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git diff --git a/compiler/HsVersions.h b/compiler/HsVersions.h index dd80922..f11aa21 100644 --- a/compiler/HsVersions.h +++ b/compiler/HsVersions.h @@ -22,40 +22,10 @@ you will screw up the layout where they are used in case expressions! * settings for the target plat instead). */ #include "../includes/ghcautoconf.h" -#if __GLASGOW_HASKELL__ >= 504 - -#define CONCURRENT Control.Concurrent -#define EXCEPTION Control.Exception - /* If you want Control.Exception.try, get it as Panic.try, which - deals with the shift from 'tryAllIO' to 'try'. */ -#define DYNAMIC Data.Dynamic -#define GLAEXTS GHC.Exts -#define DATA_BITS Data.Bits -#define DATA_INT Data.Int -#define DATA_WORD Data.Word -#define UNSAFE_IO System.IO.Unsafe -#define TRACE Debug.Trace -#define DATA_IOREF Data.IORef -#define FIX_IO System.IO -#define MONAD_ST Control.Monad.ST -#define ST_ARRAY Data.Array.ST - +#if __GLASGOW_HASKELL__ >= 602 +#define SYSTEM_IO_ERROR System.IO.Error #else - -#define CONCURRENT Concurrent -#define EXCEPTION Exception -#define DYNAMIC Dynamic -#define GLAEXTS GlaExts -#define DATA_BITS Bits -#define DATA_INT Int -#define DATA_WORD Word -#define UNSAFE_IO IOExts -#define TRACE IOExts -#define DATA_IOREF IOExts -#define FIX_IO IOExts -#define MONAD_ST ST -#define ST_ARRAY ST - +#define SYSTEM_IO_ERROR System.IO #endif #ifdef __GLASGOW_HASKELL__