X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FRtsTypes.h;h=9e8c7b847b8b4c78227bbe81a992a9c00d9596dc;hb=c137ecd7e6e83d0f9c39b15ccdb9f2355f243c91;hp=90741afc84171d4bbab56d9b52b1fa62d1e66894;hpb=d91879fb1850238deafc9a2a212d85d4c865bc7c;p=ghc-hetmet.git

diff --git a/ghc/includes/RtsTypes.h b/ghc/includes/RtsTypes.h
index 90741af..9e8c7b8 100644
--- a/ghc/includes/RtsTypes.h
+++ b/ghc/includes/RtsTypes.h
@@ -1,5 +1,5 @@
 /*
-  Time-stamp: <Mon Mar 05 2001 22:39:27 Stardate: [-30]6284.72 hwloidl>
+  Time-stamp: <2005-03-30 12:02:33 simonmar>
 
   RTS specific types.
 */
@@ -11,13 +11,15 @@
 #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__) 
@@ -35,16 +37,17 @@ typedef enum {
    Types specific to the parallel runtime system.
 */
 
+typedef ullong        rtsTime;
+
 #if defined(PAR)
 /* types only needed in the parallel system */
 typedef struct hashtable ParHashTable;
 typedef struct hashlist ParHashList;
 
-// typedef double REAL_TIME;
-// typedef W_ TIME;
-// typedef GlobalTaskId Proc;
+/* typedef double REAL_TIME; */
+/* typedef W_ TIME; */
+/* typedef GlobalTaskId Proc; */
 typedef int           GlobalTaskId;
-typedef ullong        rtsTime;
 typedef GlobalTaskId  PEs;
 typedef unsigned int  rtsWeight;
 typedef int           rtsPacket;
@@ -72,8 +75,10 @@ typedef struct gala {
 
 #elif defined(GRAN)
 
-// GlobalTaskId is dummy in GranSim; 
-// we define it to have cleaner code in the RTS
+/*
+ * GlobalTaskId is dummy in GranSim;
+ * we define it to have cleaner code in the RTS
+ */
 typedef int       GlobalTaskId;
 typedef lnat      rtsTime;
 typedef StgWord   PEs;