Fix Darwin/x86 stack alignment

[ghc-hetmet.git] / ghc / rts / Sparks.h

diff --git a/ghc/rts/Sparks.h b/ghc/rts/Sparks.h
index 089b3f4..77d280b 100644 (file)
--- a/ghc/rts/Sparks.h
+++ b/ghc/rts/Sparks.h
@@ -1,20 +1,23 @@
 /* -----------------------------------------------------------------------------
  *
- * (c) The GHC Team, 2000
+ * (c) The GHC Team, 2000-2006
  *
- * Sparking support for GRAN, PAR and SMP versions of the RTS.
+ * Sparking support for GRAN, PAR and THREADED_RTS versions of the RTS.
  * 
  * ---------------------------------------------------------------------------*/
 
 #ifndef SPARKS_H
 #define SPARKS_H
 
-#if defined(PARALLEL_HASKELL) || defined(SMP)
+#if !defined(GRAN)
+StgInt newSpark (StgRegTable *reg, StgClosure *p);
+#endif
+
+#if defined(PARALLEL_HASKELL) || defined(THREADED_RTS)
 StgClosure * findSpark         (Capability *cap);
 void         initSparkPools    (void);
 void         markSparkQueue    (evac_fn evac);
 void         createSparkThread (Capability *cap, StgClosure *p);
-StgInt       newSpark          (StgRegTable *reg, StgClosure *p);
 
 INLINE_HEADER void     discardSparks  (StgSparkPool *pool);
 INLINE_HEADER nat      sparkPoolSize  (StgSparkPool *pool);
@@ -53,7 +56,7 @@ void      markSparkQueue(void);
  * PRIVATE below here
  * -------------------------------------------------------------------------- */
 
-#if defined(PARALLEL_HASKELL) || defined(SMP)
+#if defined(PARALLEL_HASKELL) || defined(THREADED_RTS)
 
 INLINE_HEADER rtsBool
 emptySparkPool (StgSparkPool *pool)