From 5d9278289bd6886f552951e3ee85200a4ef74f7c Mon Sep 17 00:00:00 2001
From: sof <unknown>
Date: Tue, 21 Oct 1997 20:38:32 +0000
Subject: [PATCH] [project @ 1997-10-21 20:38:32 by sof] Don't use ForeignObjs
with Parallel Haskell; renamed finaliser for standard descriptors (now
freeStdFile)
---
ghc/lib/ghc/IOHandle.lhs | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/ghc/lib/ghc/IOHandle.lhs b/ghc/lib/ghc/IOHandle.lhs
index d49935801e54..72f1fae29158 100644
--- a/ghc/lib/ghc/IOHandle.lhs
+++ b/ghc/lib/ghc/IOHandle.lhs
@@ -26,9 +26,11 @@ import PrelTup
import PrelBase
import GHC
+import Foreign ( Addr,
#ifndef __PARALLEL_HASKELL__
-import Foreign ( ForeignObj, Addr, makeForeignObj, writeForeignObj )
+ ForeignObj, makeForeignObj, writeForeignObj
#endif
+ )
#if defined(__CONCURRENT_HASKELL__)
import ConcBase
@@ -127,7 +129,7 @@ stdin = unsafePerformPrimIO (
0 -> new_handle ClosedHandle
1 ->
#ifndef __PARALLEL_HASKELL__
- makeForeignObj (``stdin''::Addr) (``&freeStdChannel''::Addr) >>= \ fp ->
+ makeForeignObj (``stdin''::Addr) (``&freeStdFile''::Addr) >>= \ fp ->
new_handle (ReadHandle fp Nothing False)
#else
new_handle (ReadHandle ``stdin'' Nothing False)
@@ -146,7 +148,7 @@ stdout = unsafePerformPrimIO (
0 -> new_handle ClosedHandle
1 ->
#ifndef __PARALLEL_HASKELL__
- makeForeignObj (``stdout''::Addr) (``&freeStdChannel''::Addr) >>= \ fp ->
+ makeForeignObj (``stdout''::Addr) (``&freeStdFile''::Addr) >>= \ fp ->
new_handle (WriteHandle fp Nothing False)
#else
new_handle (WriteHandle ``stdout'' Nothing False)
@@ -165,7 +167,7 @@ stderr = unsafePerformPrimIO (
0 -> new_handle ClosedHandle
1 ->
#ifndef __PARALLEL_HASKELL__
- makeForeignObj (``stderr''::Addr) (``&freeStdChannel''::Addr) >>= \ fp ->
+ makeForeignObj (``stderr''::Addr) (``&freeStdFile''::Addr) >>= \ fp ->
new_handle (WriteHandle fp (Just NoBuffering) False)
#else
new_handle (WriteHandle ``stderr'' (Just NoBuffering) False)
--
GitLab