From: simonmar <unknown>
Date: Fri, 14 Jan 2000 12:27:50 +0000 (+0000)
Subject: [project @ 2000-01-14 12:27:50 by simonmar]
X-Git-Tag: Approximately_9120_patches~5293
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=3769b3fa2b729b1974acdc1a67217316c3a76fe3;p=ghc-hetmet.git

[project @ 2000-01-14 12:27:50 by simonmar]
expose 'par' now that we have an implementation for both sequential
and SMP ways.
---

diff --git a/ghc/lib/std/PrelConc.lhs b/ghc/lib/std/PrelConc.lhs
index f2b7b01..01faf6c 100644
--- a/ghc/lib/std/PrelConc.lhs
+++ b/ghc/lib/std/PrelConc.lhs
@@ -92,14 +92,9 @@ yield = IO $ \s ->
 seq :: a -> b -> b
 seq  x y = case (seq#  x) of { 0# -> seqError; _ -> y }
 
-par :: a -> b -> b
-
 {-# INLINE par  #-}
-#if defined(__PARALLEL_HASKELL__) || defined (__GRANSIM__)
+par :: a -> b -> b
 par  x y = case (par# x) of { 0# -> parError; _ -> y }
-#else
-par  _ y = y
-#endif
 \end{code}
 
 %************************************************************************