From a2e5c0a8dfac5818cef1cdc8cc1ccec6a939b9e9 Mon Sep 17 00:00:00 2001
From: simonm <unknown>
Date: Thu, 25 Mar 1999 13:10:32 +0000
Subject: [PATCH] [project @ 1999-03-25 13:10:32 by simonm] Remove #ifdef
__CONCURRENT_HASKELL__, update for H98.
---
ghc/lib/concurrent/Merge.lhs | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/ghc/lib/concurrent/Merge.lhs b/ghc/lib/concurrent/Merge.lhs
index 73cacc53fdd2..5414c97fbb27 100644
--- a/ghc/lib/concurrent/Merge.lhs
+++ b/ghc/lib/concurrent/Merge.lhs
@@ -24,13 +24,6 @@ max_buff_size = 1
mergeIO :: [a] -> [a] -> IO [a]
nmergeIO :: [[a]] -> IO [a]
-#ifndef __CONCURRENT_HASKELL__
-
-mergeIO _ _ = return []
-nmergeIO _ = return []
-
-#else
-
mergeIO ls rs
= newEmptyMVar >>= \ tail_node ->
newMVar tail_node >>= \ tail_list ->
@@ -87,7 +80,5 @@ nmergeIO lss
signalQSem e >>
return val
where
- mapIO f xs = accumulate (map f xs)
-
-#endif {- __CONCURRENT_HASKELL__ -}
+ mapIO f xs = sequence (map f xs)
\end{code}
--
GitLab