allow build settings to be overriden by adding mk/validate.mk

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

diff --git a/includes/Rts.h b/includes/Rts.h
index 59edc09..d009618 100644 (file)
--- a/includes/Rts.h
+++ b/includes/Rts.h
@@ -145,7 +145,11 @@ extern void _assertFail (const char *, unsigned int);
 #include "SMP.h"
 
 /* GNU mp library */
+#if defined(HAVE_FRAMEWORK_GMP)
+#include <GMP/gmp.h>
+#else
 #include "gmp.h"
+#endif
 
 /* Macros for STG/C code */
 #include "Block.h"
@@ -270,11 +274,11 @@ extern void stg_exit(int n) GNU_ATTRIBUTE(__noreturn__);
    -------------------------------------------------------------------------- */
 
 typedef struct _StgEntCounter {
-  /* krc: StgWord32, not StgWord16, in order to match the code
-     generator, which doesn't generate anything of that type. */
-    StgWord32  registeredp;    /* 0 == no, 1 == yes */
-    StgWord32  arity;          /* arity (static info) */
-    StgWord32  stk_args;       /* # of args off stack */
+  /* Using StgWord for everything, becuase both the C and asm code
+     generators make trouble if you try to pack things tighter */
+    StgWord    registeredp;    /* 0 == no, 1 == yes */
+    StgInt     arity;          /* arity (static info) */
+    StgInt     stk_args;       /* # of args off stack */
                                /* (rest of args are in registers) */
     char       *str;           /* name of the thing */
     char       *arg_kinds;     /* info about the args types */