From: sof <unknown>
Date: Wed, 24 Sep 1997 00:58:27 +0000 (+0000)
Subject: [project @ 1997-09-24 00:58:27 by sof]
X-Git-Tag: Approx_2487_patches~1477
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=79fc30416b4f7976cd0a0f9558cd0875cd024c1f

[project @ 1997-09-24 00:58:27 by sof]
Enable fork# with __CONCURRENT_HASKELL__
---

diff --git a/ghc/lib/ghc/ConcBase.lhs b/ghc/lib/ghc/ConcBase.lhs
index 5763723..20d0346 100644
--- a/ghc/lib/ghc/ConcBase.lhs
+++ b/ghc/lib/ghc/ConcBase.lhs
@@ -69,11 +69,16 @@ par, fork :: Eval a => a -> b -> b
 
 #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}
 
 %************************************************************************