X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FStg.h;h=06a866256e0d94408d2f72a6f5443a6964889af2;hb=ad379ff7e22681c09ec7b50bc00d2d6cd3ae3263;hp=32e838090b76e93cd62d341bc13bad0accc7808c;hpb=ba1d2fd1914971cd2f9c351670805ea512b6a281;p=ghc-hetmet.git

diff --git a/includes/Stg.h b/includes/Stg.h
index 32e8380..06a8662 100644
--- a/includes/Stg.h
+++ b/includes/Stg.h
@@ -36,7 +36,8 @@
 // constants from math.h, which we occasionally need to use in .hc (#1861)
 # define _ISOC99_SOURCE
 
-// Turning on _ISOC99_SOURCE means S_ISSOCK gets defined on Linux
+// We need _BSD_SOURCE so that math.h defines things like gamma
+// on Linux
 # define _BSD_SOURCE
 #endif
 
@@ -77,6 +78,10 @@
 #define BITS_PER_BYTE 8
 #define BITS_IN(x) (BITS_PER_BYTE * sizeof(x))
 
+/* Compute offsets of struct fields
+ */
+#define STG_FIELD_OFFSET(s_type, field) ((StgWord)&(((s_type*)0)->field))
+
 /*
  * 'Portable' inlining:
  * INLINE_HEADER is for inline functions in header files (macros)
@@ -205,9 +210,7 @@ typedef StgWord StgWordArray[];
 #include "MachRegs.h"
 #include "Regs.h"
 
-#ifdef TICKY_TICKY
 #include "TickyCounters.h"
-#endif
 
 #if IN_STG_CODE
 /*