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

diff --git a/includes/Stg.h b/includes/Stg.h
index 394c987..06a8662 100644
--- a/includes/Stg.h
+++ b/includes/Stg.h
@@ -35,6 +35,10 @@
 // Turn on C99 for .hc code.  This gives us the INFINITY and NAN
 // constants from math.h, which we occasionally need to use in .hc (#1861)
 # define _ISOC99_SOURCE
+
+// We need _BSD_SOURCE so that math.h defines things like gamma
+// on Linux
+# define _BSD_SOURCE
 #endif
 
 #if IN_STG_CODE == 0
@@ -76,7 +80,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 +210,7 @@ typedef StgWord StgWordArray[];
 #include "MachRegs.h"
 #include "Regs.h"
 
-#ifdef TICKY_TICKY
 #include "TickyCounters.h"
-#endif
 
 #if IN_STG_CODE
 /*