Lock the StablePtr table during GC

[ghc-hetmet.git] / includes / Stg.h

diff --git a/includes/Stg.h b/includes/Stg.h
index 394c987..341cda3 100644 (file)
--- a/includes/Stg.h
+++ b/includes/Stg.h
@@ -76,7 +76,7 @@
 
 /* Compute offsets of struct fields
  */
-#define FIELD_OFFSET(s_type, field) ((StgWord)&(((s_type*)0)->field))
+#define STG_FIELD_OFFSET(s_type, field) ((StgWord)&(((s_type*)0)->field))
 
 /*
  * 'Portable' inlining:
@@ -206,9 +206,7 @@ typedef StgWord StgWordArray[];
 #include "MachRegs.h"
 #include "Regs.h"
 
-#ifdef TICKY_TICKY
 #include "TickyCounters.h"
-#endif
 
 #if IN_STG_CODE
 /*