summaryrefslogtreecommitdiff
path: root/ghc/rts/Interpreter.c
diff options
context:
space:
mode:
authorsof <unknown>2003-11-12 17:49:11 +0000
committersof <unknown>2003-11-12 17:49:11 +0000
commit20593d1d1cf47050d9430895a1c2ada6c39dfb98 (patch)
tree0f93410b3bf46f851d5fc08085d0c9a8300d3cd4 /ghc/rts/Interpreter.c
parenta814590c794226b34c0c9aff4138b0e7722ddab5 (diff)
downloadhaskell-20593d1d1cf47050d9430895a1c2ada6c39dfb98.tar.gz
[project @ 2003-11-12 17:49:05 by sof]
Tweaks to have RTS (C) sources compile with MSVC. Apart from wibbles related to the handling of 'inline', changed Schedule.h:POP_RUN_QUEUE() not to use expression-level statement blocks.
Diffstat (limited to 'ghc/rts/Interpreter.c')
-rw-r--r--ghc/rts/Interpreter.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ghc/rts/Interpreter.c b/ghc/rts/Interpreter.c
index 888f3b8f2d..cc18059f22 100644
--- a/ghc/rts/Interpreter.c
+++ b/ghc/rts/Interpreter.c
@@ -63,13 +63,13 @@
return (retcode);
-static inline StgPtr
+STATIC_INLINE StgPtr
allocate_UPD (int n_words)
{
return allocate(stg_max(sizeofW(StgHeader)+MIN_UPD_SIZE, n_words));
}
-static inline StgPtr
+STATIC_INLINE StgPtr
allocate_NONUPD (int n_words)
{
return allocate(stg_max(sizeofW(StgHeader)+MIN_NONUPD_SIZE, n_words));
@@ -1212,7 +1212,7 @@ run_BCO:
#endif
// And restart the thread again, popping the RET_DYN frame.
- cap = (Capability *)((void *)resumeThread(tok,rtsFalse) - sizeof(StgFunTable));
+ cap = (Capability *)((void *)((unsigned char*)resumeThread(tok,rtsFalse) - sizeof(StgFunTable)));
LOAD_STACK_POINTERS;
Sp += ret_dyn_size;