X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FHsVersions.h;h=530b0faf5a05f84bb632a42f33598273d355f0ca;hb=19b44dcc5e5b9f92735fa99aa45dfaa94777177c;hp=464bf820297d5b74ba15697b8b159aff9ddca20c;hpb=d068f78b3ae99da8976e0836739cde6213c40041;p=ghc-hetmet.git

diff --git a/compiler/HsVersions.h b/compiler/HsVersions.h
index 464bf82..530b0fa 100644
--- a/compiler/HsVersions.h
+++ b/compiler/HsVersions.h
@@ -22,13 +22,15 @@ 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__ >= 602
+#if !defined(__GLASGOW_HASKELL__) || __GLASGOW_HASKELL__ >= 602
 #define SYSTEM_IO_ERROR System.IO.Error
 #else
 #define SYSTEM_IO_ERROR System.IO
 #endif
 
-#ifdef __GLASGOW_HASKELL__
+/* Global variables may not work in other Haskell implementations,
+ * but we need them currently! so the conditional on GLASGOW won't do. */
+#if defined(__GLASGOW_HASKELL__) || !defined(__GLASGOW_HASKELL__)
 #define GLOBAL_VAR(name,value,ty)  \
 name = Util.global (value) :: IORef (ty); \
 {-# NOINLINE name #-}
@@ -40,6 +42,8 @@ name = Util.global (value) :: IORef (ty); \
 #define debugIsOn True
 #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 MASSERT(e)      ASSERT(e) return ()
+#define MASSERT2(e,msg) ASSERT2(e,msg) return ()
 #define WARN( e, msg ) (warnPprTrace (e) __FILE__ __LINE__ (msg))
 #define ASSERTM(mbool) do { bool <- mbool; ASSERT(bool) return () }
 #define ASSERTM2(mbool,msg) do { bool <- mbool; ASSERT2(bool,msg) return () }
@@ -49,21 +53,30 @@ name = Util.global (value) :: IORef (ty); \
 -- unused variable warnings when DEBUG is off.
 #define ASSERT(e)      if False && (not (e)) then panic "ASSERT" else
 #define ASSERT2(e,msg) if False && (not (e)) then pprPanic "ASSERT2" (msg) else
+#define MASSERT(e)      ASSERT(e) return ()
+#define MASSERT2(e,msg) ASSERT2(e,msg) return ()
 #define ASSERTM(e)       do { let { _mbool = (e) } }
 -- Here we deliberately don't use when as Control.Monad might not be imported
 #define ASSERTM2(e,msg)  do { let { _mbool = (e) }; if False then panic "ASSERTM2" else return () }
 #define WARN(e,msg)    if False && (e) then pprPanic "WARN" (msg) else
 #endif
 
--- This #ifndef lets us switch off the "import FastString"
--- when compiling FastString itself
-#ifndef COMPILING_FAST_STRING
+-- This conditional lets us switch off the "import FastString"
+-- when compiling FastString itself, or when compiling modules that
+-- don't use it (and would otherwise get warnings, which we treat
+-- as errors). Can we do this more nicely?
+#if !defined(COMPILING_FAST_STRING) && !defined(FAST_STRING_NOT_NEEDED)
 -- 
 import qualified FastString as FS 
 #endif
 
+#if defined(__GLASGOW_HASKELL__)
 #define SLIT(x)	 (FS.mkLitString# (x#))
 #define FSLIT(x) (FS.mkFastString# (x#))
+#else
+#define SLIT(x)  (FS.mkLitString (x))
+#define FSLIT(x) (FS.mkFastString (x))
+#endif
 
 -- Useful for declaring arguments to be strict
 #define STRICT1(f) f a | a `seq` False = undefined