[project @ 2000-04-13 19:31:05 by panne]

Bootstrapping fun:

   * Addr is an abstract type in Addr, so import from PrelAddr instead
   * Ignore the (recently introduced) return value of hPutBuf{,BA}

Probably more to come. No problem, as long as I don't run out of malt
first... %-)

diff --git a/ghc/compiler/utils/FastString.lhs b/ghc/compiler/utils/FastString.lhs
index 7560642..3d63e7f 100644 (file)
--- a/ghc/compiler/utils/FastString.lhs
+++ b/ghc/compiler/utils/FastString.lhs
@@ -86,7 +86,7 @@ import PrelIOBase     ( Handle__(..), IOError(..), IOErrorType(..),
 
 import PrimPacked
 import GlaExts
-import Addr            ( Addr(..) )
+import PrelAddr                ( Addr(..) )
 #if __GLASGOW_HASKELL__ < 407
 import MutableArray    ( MutableArray(..) )
 #else
@@ -640,6 +640,7 @@ hPutFS handle (FastString _ l# ba#)
 #else
   | otherwise  = do mba <- stToIO $ unsafeThawByteArray (ByteArray (bot::Int) bot ba#)
                     hPutBufBA  handle mba (I# l#)
+                    return ()
 #endif
  where
   bot = error "hPutFS.ba"
@@ -648,7 +649,7 @@ hPutFS handle (FastString _ l# ba#)
 
 hPutFS handle (CharStr a# l#)
   | l# ==# 0#  = return ()
-  | otherwise  = hPutBuf handle (A# a#) (I# l#)
+  | otherwise  = do hPutBuf handle (A# a#) (I# l#) ; return ()
 
 
 #endif

diff --git a/ghc/compiler/utils/PrimPacked.lhs b/ghc/compiler/utils/PrimPacked.lhs
index 96c17f1..aa38d6a 100644 (file)
--- a/ghc/compiler/utils/PrimPacked.lhs
+++ b/ghc/compiler/utils/PrimPacked.lhs
@@ -31,7 +31,7 @@ module PrimPacked
 #include "HsVersions.h"
 
 import GlaExts
-import Addr    ( Addr(..) )
+import PrelAddr        ( Addr(..) )
 import ST
 import Foreign
 -- ForeignObj is now exported abstractly.