X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fincludes%2FSchedAPI.h;h=3814b6f4a7230ab885613cd9ddd8e1473fcb1507;hb=f2506c8c109dfbf063fa2a239ea95c8f8cd167f1;hp=524b1da9f58f47b561b17837bb06ab740fee5ec9;hpb=d22a123f2351c8c31dc4f65981edd96b59b27c54;p=ghc-hetmet.git

diff --git a/ghc/includes/SchedAPI.h b/ghc/includes/SchedAPI.h
index 524b1da..3814b6f 100644
--- a/ghc/includes/SchedAPI.h
+++ b/ghc/includes/SchedAPI.h
@@ -1,5 +1,4 @@
 /* -----------------------------------------------------------------------------
- * $Id: SchedAPI.h,v 1.17 2002/12/27 12:33:21 panne Exp $
  *
  * (c) The GHC Team 1998-2002
  *
@@ -12,11 +11,12 @@
 #define SCHEDAPI_H
 
 #if defined(GRAN)
-// Dummy def for NO_PRI if not in GranSim
+/* Dummy def for NO_PRI if not in GranSim */
 #define NO_PRI  0
 #endif
 
-extern SchedulerStatus waitThread(StgTSO *main_thread, /*out*/StgClosure **ret);
+extern SchedulerStatus waitThread(StgTSO *main_thread, /*out*/StgClosure **ret,
+                                  Capability *initialCapability);
 
 /* 
  * Creating threads
@@ -26,18 +26,16 @@ extern StgTSO *createThread(nat stack_size, StgInt pri);
 #else
 extern StgTSO *createThread(nat stack_size);
 #endif
-#if defined(PAR) || defined(SMP)
-extern void taskStart(void);
-#endif
 extern void scheduleThread(StgTSO *tso);
-extern SchedulerStatus scheduleWaitThread(StgTSO *tso, /*out*/HaskellObj* ret);
+extern SchedulerStatus scheduleWaitThread(StgTSO *tso, /*out*/HaskellObj* ret,
+                                          Capability *initialCapability);
 
-static inline void pushClosure   (StgTSO *tso, StgWord c) {
+INLINE_HEADER void pushClosure   (StgTSO *tso, StgWord c) {
   tso->sp--;
   tso->sp[0] = (W_) c;
 }
 
-static inline StgTSO *
+INLINE_HEADER StgTSO *
 createGenThread(nat stack_size,  StgClosure *closure) {
   StgTSO *t;
 #if defined(GRAN)
@@ -50,7 +48,7 @@ createGenThread(nat stack_size,  StgClosure *closure) {
   return t;
 }
 
-static inline StgTSO *
+INLINE_HEADER StgTSO *
 createIOThread(nat stack_size,  StgClosure *closure) {
   StgTSO *t;
 #if defined(GRAN)
@@ -70,7 +68,7 @@ createIOThread(nat stack_size,  StgClosure *closure) {
  * to whnf while we're at it.
  */
 
-static inline StgTSO *
+INLINE_HEADER StgTSO *
 createStrictIOThread(nat stack_size,  StgClosure *closure) {
   StgTSO *t;
 #if defined(GRAN)