From 20593d1d1cf47050d9430895a1c2ada6c39dfb98 Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Wed, 12 Nov 2003 17:49:11 +0000
Subject: [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.

---
 ghc/rts/Interpreter.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'ghc/rts/Interpreter.c')

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;
 	    
-- 
cgit v1.2.1