X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FStg.h;h=341cda36687b92cb27d7d32729c28815774635fa;hb=d9275dd06ee24575ff50a6696fe7fe1e1fa91ac7;hp=394c987f079e3732cbaa905c70f404618d92f9bb;hpb=164be7854f6de07bb4bc15f60af727ddb562cde7;p=ghc-hetmet.git

diff --git a/includes/Stg.h b/includes/Stg.h
index 394c987..341cda3 100644
--- 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
 /*