projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't generate stub files when -fno-code is given.
[ghc-hetmet.git]
/
ghc
/
includes
/
RtsTypes.h
diff --git
a/ghc/includes/RtsTypes.h
b/ghc/includes/RtsTypes.h
index
4a30ef9
..
9e8c7b8
100644
(file)
--- a/
ghc/includes/RtsTypes.h
+++ b/
ghc/includes/RtsTypes.h
@@
-1,5
+1,5
@@
/*
/*
- Time-stamp: <2004-11-08 12:17:01 simonmar>
+ Time-stamp: <2005-03-30 12:02:33 simonmar>
RTS specific types.
*/
RTS specific types.
*/
@@
-11,11
+11,7
@@
#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 */
#ifndef _MSC_VER
typedef unsigned long long ullong; /* at least 32 bits */
typedef unsigned long lnat; /* at least 32 bits */
#ifndef _MSC_VER
typedef unsigned long long ullong; /* at least 32 bits */
@@
-48,9
+44,9
@@
typedef ullong rtsTime;
typedef struct hashtable ParHashTable;
typedef struct hashlist ParHashList;
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 GlobalTaskId PEs;
typedef unsigned int rtsWeight;
typedef int GlobalTaskId;
typedef GlobalTaskId PEs;
typedef unsigned int rtsWeight;
@@
-79,8
+75,10
@@
typedef struct gala {
#elif defined(GRAN)
#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;
typedef int GlobalTaskId;
typedef lnat rtsTime;
typedef StgWord PEs;