projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-07-21 14:28:02 by simonmar]
[ghc-hetmet.git]
/
ghc
/
includes
/
RtsTypes.h
diff --git
a/ghc/includes/RtsTypes.h
b/ghc/includes/RtsTypes.h
index
10c4bde
..
90741af
100644
(file)
--- 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.
*/
RTS specific types.
*/
@@
-11,7
+11,11
@@
#ifndef RTS_TYPES_H
#define RTS_TYPES_H
#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) */
typedef unsigned int nat; /* at least 32 bits (like int) */
+#endif
typedef unsigned long lnat; /* at least 32 bits */
typedef unsigned long long ullong; /* at least 32 bits */
typedef unsigned long lnat; /* at least 32 bits */
typedef unsigned long long ullong; /* at least 32 bits */
@@
-68,6
+72,9
@@
typedef struct gala {
#elif defined(GRAN)
#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;
typedef lnat rtsTime;
typedef StgWord PEs;