Put debugIsOn in Util, rather than rely on it being CPPed in

[ghc-hetmet.git] / compiler / HsVersions.h

diff --git a/compiler/HsVersions.h b/compiler/HsVersions.h
index 530b0fa..034a9bc 100644 (file)
--- a/compiler/HsVersions.h
+++ b/compiler/HsVersions.h
@@ -32,14 +32,14 @@ you will screw up the layout where they are used in case expressions!
  * 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 #-}
+{-# NOINLINE name #-};             \
+name :: IORef (ty);                \
+name = Util.global (value);
 #endif
 
 #define COMMA ,
 
 #ifdef DEBUG
-#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 ()
@@ -48,7 +48,6 @@ name = Util.global (value) :: IORef (ty); \
 #define ASSERTM(mbool) do { bool <- mbool; ASSERT(bool) return () }
 #define ASSERTM2(mbool,msg) do { bool <- mbool; ASSERT2(bool,msg) return () }
 #else
-#define debugIsOn False
 -- We have to actually use all the variables we are given or we may get
 -- unused variable warnings when DEBUG is off.
 #define ASSERT(e)      if False && (not (e)) then panic "ASSERT" else