projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1997-11-24 21:17:52 by sof]
[ghc-hetmet.git]
/
ghc
/
includes
/
Parallel.lh
diff --git
a/ghc/includes/Parallel.lh
b/ghc/includes/Parallel.lh
index
4d060cf
..
f87aa0c
100644
(file)
--- a/
ghc/includes/Parallel.lh
+++ b/
ghc/includes/Parallel.lh
@@
-85,13
+85,16
@@
void freeHashTable PROTO((HashTable *table, void (*freeDataFun) PROTO((void *dat
HashTable *allocHashTable(STG_NO_ARGS);
void *removeHashTable PROTO((HashTable *table, StgWord key, void *data));
HashTable *allocHashTable(STG_NO_ARGS);
void *removeHashTable PROTO((HashTable *table, StgWord key, void *data));
+/*
+ Redefining exit is more trouble than its worth, IMO -- SOF
+*/
extern void myexit PROTO((I_));
# define EXIT myexit
extern void myexit PROTO((I_));
# define EXIT myexit
-# define exit : error : Wrong exit!
+/* # define exit : error : Wrong exit! */
+
# else
# define EXIT exit
# endif
# else
# define EXIT exit
# endif
-
\end{code}
%************************************************************************
\end{code}
%************************************************************************
@@
-548,13
+551,14
@@
P_ get_closure_info PROTO((P_ closure, W_ *size, W_ *ptrs, W_ *nonptrs, W_
# define PACK_HDR_SIZE 4 /* Words of header in a packet */
# define PACK_HEAP_REQUIRED \
# define PACK_HDR_SIZE 4 /* Words of header in a packet */
# define PACK_HEAP_REQUIRED \
- ((RTSflags.GranFlags.packBufferSize - PACK_HDR_SIZE) / (PACK_GA_SIZE + _FHS) * (SPEC_HS + 2))
+ ((RTSflags.GranFlags.packBufferSize - PACK_HDR_SIZE) / (PACK_GA_SIZE \
+ + _FHS) * (SPEC_HS + 2))
# define PACK_FLAG_LOCN 0
# define PACK_TSO_LOCN 1
# define PACK_UNPACKED_SIZE_LOCN 2
# define PACK_SIZE_LOCN 3
# define PACK_FLAG_LOCN 0
# define PACK_TSO_LOCN 1
# define PACK_UNPACKED_SIZE_LOCN 2
# define PACK_SIZE_LOCN 3
-# define MAGIC_PACK_FLAG 0xfabc
+# define MAGIC_PACK_FLAG 0xfabc
#endif
#endif /* Parallel_H */
#endif
#endif /* Parallel_H */