[project @ 1997-09-24 00:58:27 by sof]

[ghc-hetmet.git] / ghc / lib / ghc / ConcBase.lhs

diff --git a/ghc/lib/ghc/ConcBase.lhs b/ghc/lib/ghc/ConcBase.lhs
index 8dd4097..20d0346 100644 (file)
--- a/ghc/lib/ghc/ConcBase.lhs
+++ b/ghc/lib/ghc/ConcBase.lhs
@@ -67,13 +67,18 @@ par, fork :: Eval a => a -> b -> b
 {-# INLINE par  #-}
 {-# INLINE fork #-}
 
-#ifdef __CONCURRENT_HASKELL__
+#if defined(__PARALLEL_HASKELL__) || defined (__GRANSIM__)
 par  x y = case (par#  x) of { 0# -> parError; _ -> y }
-fork x y = case (fork# x) of { 0# -> parError; _ -> y }
 #else
 par  x y = y
+#endif
+
+#if defined(__CONCURRENT_HASKELL__) || defined (__GRANSIM__)
+fork x y = case (fork# x) of { 0# -> parError; _ -> y }
+#else
 fork x y = y
 #endif
+
 \end{code}
 
 %************************************************************************
@@ -148,8 +153,9 @@ virtual time, so we start ticking in real time.  (The granularity is
 the effective resolution of the context switch timer, so it is
 affected by the RTS -C option.)
 
-@threadWait@ delays rescheduling of a thread until input on the
+@threadWaitRead@ delays rescheduling of a thread until input on the
 specified file descriptor is available for reading (just like select).
+@threadWaitWrite@ is similar, but for writing on a file descriptor.
 
 \begin{code}
 threadDelay, threadWaitRead, threadWaitWrite :: Int -> IO ()