From: sewardj Date: Tue, 30 May 2000 12:50:04 +0000 (+0000) Subject: [project @ 2000-05-30 12:50:04 by sewardj] X-Git-Tag: Approximately_9120_patches~4352 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=5f5f6da0f97f4528e36c7fa57b99fb68714d9fc5;p=ghc-hetmet.git [project @ 2000-05-30 12:50:04 by sewardj] Fix cyclic dependency problem when compiling the Prelude. --- diff --git a/ghc/lib/std/PrelIOBase.lhs b/ghc/lib/std/PrelIOBase.lhs index d037275..c87b9ca 100644 --- a/ghc/lib/std/PrelIOBase.lhs +++ b/ghc/lib/std/PrelIOBase.lhs @@ -1,5 +1,5 @@ % ----------------------------------------------------------------------------- -% $Id: PrelIOBase.lhs,v 1.23 2000/04/14 15:28:24 rrt Exp $ +% $Id: PrelIOBase.lhs,v 1.24 2000/05/30 12:50:04 sewardj Exp $ % % (c) The AQUA Project, Glasgow University, 1994-1998 % @@ -24,7 +24,7 @@ import PrelBase import {-# SOURCE #-} PrelException ( ioError ) import PrelMaybe ( Maybe(..) ) import PrelAddr ( Addr(..), nullAddr ) -import PrelPack ( unpackCString ) +import {-# SOURCE #-} PrelPack ( unpackCString ) import PrelShow #if !defined(__CONCURRENT_HASKELL__) diff --git a/ghc/lib/std/PrelPack.hi-boot b/ghc/lib/std/PrelPack.hi-boot index e7e6f6e..d23bd74 100644 --- a/ghc/lib/std/PrelPack.hi-boot +++ b/ghc/lib/std/PrelPack.hi-boot @@ -7,7 +7,8 @@ -- other Prelude files that precede PrelPack --------------------------------------------------------------------------- -__interface PrelPack 1 1 1 where -__export PrelPack packCStringzh ; +__interface "std" PrelPack 1 407 where +__export PrelPack packCStringzh unpackCString ; 1 packCStringzh :: [PrelBase.Char] -> PrelGHC.ByteArrayzh ; +1 unpackCString :: PrelAddr.Addr -> [PrelBase.Char] ;