X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=includes%2FRts.h;h=d009618442e23e9285845267286faabd7cec5beb;hp=59edc09e83ab5b8df996b45621f5db0f8090bc23;hb=8a2809c29de9f23eba7ca682b48390033a9d40f6;hpb=5ddee764beb312933256096d03df7c3ec47ac452

diff --git a/includes/Rts.h b/includes/Rts.h
index 59edc09..d009618 100644
--- 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 */