X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=includes%2FRts.h;h=7ed9c2d9b4fd32aa4c956b84a32dac5ebe407ef0;hb=0a8f685b4c66093df7732c6b92a631cf4c84c05d;hp=a62747e4384d92ef61750c1f74ae622763d9018b;hpb=b4ee9a92737e40ac0133f833781d01a8589f2cb7;p=ghc-hetmet.git

diff --git a/includes/Rts.h b/includes/Rts.h
index a62747e..7ed9c2d 100644
--- a/includes/Rts.h
+++ b/includes/Rts.h
@@ -18,6 +18,12 @@ extern "C" {
 #endif
 #include "Stg.h"
 
+// Turn off inlining when debugging - it obfuscates things
+#ifdef DEBUG
+# undef  STATIC_INLINE
+# define STATIC_INLINE static
+#endif
+
 #include "RtsTypes.h"
 
 #if __GNUC__ >= 3
@@ -57,7 +63,7 @@ extern "C" {
 #define ASSERT(predicate) /* nothing */
 #else
 
-extern void _assertFail (char *, unsigned int);
+extern void _assertFail (const char *, unsigned int);
 
 #define ASSERT(predicate)			\
 	if (predicate)				\
@@ -90,6 +96,17 @@ extern void _assertFail (char *, unsigned int);
 #define USED_IF_NOT_THREADS
 #endif
 
+/*
+ * Getting printf formats right for platform-dependent typedefs
+ */
+#if SIZEOF_LONG == 8
+#define FMT_Word64 "lu"
+#define FMT_Int64  "ld"
+#else
+#define FMT_Word64 "llu"
+#define FMT_Int64  "lld"
+#endif
+
 /* -----------------------------------------------------------------------------
    Include everything STG-ish
    -------------------------------------------------------------------------- */
@@ -127,16 +144,13 @@ extern void _assertFail (char *, unsigned int);
 #include "OSThreads.h"
 #include "SMP.h"
 
-/* STG/Optimised-C related stuff */
-#include "Block.h"
-
 /* GNU mp library */
 #include "gmp.h"
 
 /* Macros for STG/C code */
+#include "Block.h"
 #include "ClosureMacros.h"
 #include "StgTicky.h"
-#include "Stable.h"
 
 /* Runtime-system hooks */
 #include "Hooks.h"