X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=includes%2FRts.h;h=7a30d9ee5284e18d6c075611da255e9a3da8cb0f;hp=3ca0d9a9130d32cc826ad768bddbd13677a34fc4;hb=c76c69c5b62f1ca4fa52d75b0dfbd37b7eddbb09;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1

diff --git a/includes/Rts.h b/includes/Rts.h
index 3ca0d9a..7a30d9e 100644
--- a/includes/Rts.h
+++ b/includes/Rts.h
@@ -34,6 +34,10 @@ extern "C" {
 #define __MSVCRT__ 1
 #endif
 
+/* Needed to get the macro version of errno on some OSs, and also to
+   get prototypes for the _r versions of C library functions. */
+#define _REENTRANT 1
+
 /*
  * We often want to know the size of something in units of an
  * StgWord... (rounded up, of course!)
@@ -53,7 +57,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)				\
@@ -86,6 +90,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
    -------------------------------------------------------------------------- */