diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-11-01 14:32:20 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-11-01 14:32:20 +0000 |
| commit | d163845c7cade0892db4325e430a84a350ff147c (patch) | |
| tree | 09da9879369f97dbfb777631e047b5296e0f1f40 /includes | |
| parent | 229323898b0809047b19b79c181085430cce9850 (diff) | |
| parent | 225172e68980ce948e2fd00aa2d8a81657207525 (diff) | |
| download | haskell-d163845c7cade0892db4325e430a84a350ff147c.tar.gz | |
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/Rts.h | 6 | ||||
| -rw-r--r-- | includes/rts/storage/Closures.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/includes/Rts.h b/includes/Rts.h index b31776828f..edb48c1a91 100644 --- a/includes/Rts.h +++ b/includes/Rts.h @@ -306,6 +306,12 @@ TICK_VAR(2) #define DEBUG_ONLY(s) doNothing() #endif +#ifdef DEBUG +#define DEBUG_IS_ON 1 +#else +#define DEBUG_IS_ON 0 +#endif + /* ----------------------------------------------------------------------------- Useful macros and inline functions -------------------------------------------------------------------------- */ diff --git a/includes/rts/storage/Closures.h b/includes/rts/storage/Closures.h index fcba1ebeb6..2302b7d2a1 100644 --- a/includes/rts/storage/Closures.h +++ b/includes/rts/storage/Closures.h @@ -306,9 +306,7 @@ typedef struct { StgHeader header; StgClosure *volatile current_value; StgTVarWatchQueue *volatile first_watch_queue_entry; -#if defined(THREADED_RTS) StgInt volatile num_updates; -#endif } StgTVar; typedef struct { |