X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FHsVersions.h;h=853e58661e2136c9cf44766431d95856c97c2468;hb=e5ad9dcc35c7a0bb9b8ebca29940cbf32c6b150a;hp=62c9c076a640e6a0a72369fdbc09dc36a799afd1;hpb=ce9687a5f450014c5596b32de8e8a7b99b6389e8;p=ghc-hetmet.git

diff --git a/ghc/compiler/HsVersions.h b/ghc/compiler/HsVersions.h
index 62c9c07..853e586 100644
--- a/ghc/compiler/HsVersions.h
+++ b/ghc/compiler/HsVersions.h
@@ -14,6 +14,8 @@ you will screw up the layout where they are used in case expressions!
 
 #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
@@ -23,6 +25,8 @@ you will screw up the layout where they are used in case expressions!
 #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
 
 #else
 
@@ -37,6 +41,8 @@ you will screw up the layout where they are used in case expressions!
 #define TRACE       IOExts
 #define DATA_IOREF  IOExts
 #define FIX_IO      IOExts
+#define MONAD_ST    ST
+#define ST_ARRAY    ST
 
 #endif
 
@@ -52,9 +58,11 @@ name = Util.global (value) :: IORef (ty); \
 #define ASSERT(e) if (not (e)) then (assertPanic __FILE__ __LINE__) else
 #define ASSERT2(e,msg) if (not (e)) then (assertPprPanic __FILE__ __LINE__ (msg)) else
 #define WARN( e, msg ) (warnPprTrace (e) __FILE__ __LINE__ (msg))
+#define ASSERTM(e) ASSERT(e) do
 #else
 #define ASSERT(e)
 #define ASSERT2(e,msg)
+#define ASSERTM(e)
 #define WARN(e,msg)
 #endif