X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FRtsTypes.h;h=e03ca1e9927c0b5a3d05b8f6ec9b8cf32963f52f;hb=423d477bfecd490de1449c59325c8776f91d7aac;hp=10c4bdeb49ee44237dcefb213e200eccde936fe8;hpb=1b28d4e1f43185ad8c8e7407c66413e1b358402b;p=ghc-hetmet.git

diff --git a/ghc/includes/RtsTypes.h b/ghc/includes/RtsTypes.h
index 10c4bde..e03ca1e 100644
--- a/ghc/includes/RtsTypes.h
+++ b/ghc/includes/RtsTypes.h
@@ -1,5 +1,5 @@
 /*
-  Time-stamp: <Mon Nov 22 1999 21:29:44 Stardate: [-30]3939.47 hwloidl>
+  Time-stamp: <Mon Mar 05 2001 22:39:27 Stardate: [-30]6284.72 hwloidl>
 
   RTS specific types.
 */
@@ -11,9 +11,19 @@
 #ifndef RTS_TYPES_H
 #define RTS_TYPES_H
 
+#if SIZEOF_VOID_P == 8
+typedef unsigned long nat;           /* at least 32 bits (like int) */
+#else
 typedef unsigned int  nat;           /* at least 32 bits (like int) */
+#endif
 typedef unsigned long lnat;          /* at least 32 bits            */
+#ifndef _MSC_VER
 typedef unsigned long long ullong;   /* at least 32 bits            */
+typedef long long llong;
+#else
+typedef unsigned __int64   ullong;   /* at least 32 bits            */
+typedef __int64 llong;
+#endif
 
 /* ullong (64|128-bit) type: only include if needed (not ANSI) */
 #if defined(__GNUC__) 
@@ -68,6 +78,9 @@ typedef struct gala {
 
 #elif defined(GRAN)
 
+// GlobalTaskId is dummy in GranSim; 
+// we define it to have cleaner code in the RTS
+typedef int       GlobalTaskId;
 typedef lnat      rtsTime;
 typedef StgWord   PEs;