From: simonmar Date: Fri, 14 Apr 2000 08:29:49 +0000 (+0000) Subject: [project @ 2000-04-14 08:29:49 by simonmar] X-Git-Tag: Approximately_9120_patches~4706 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=fd1c3119f74e4cbeb34d54a929a565434d579795;p=ghc-hetmet.git [project @ 2000-04-14 08:29:49 by simonmar] we should be using hPutBufFull here. --- diff --git a/ghc/compiler/utils/FastString.lhs b/ghc/compiler/utils/FastString.lhs index 3d63e7f..4b55c0d 100644 --- a/ghc/compiler/utils/FastString.lhs +++ b/ghc/compiler/utils/FastString.lhs @@ -91,7 +91,7 @@ import PrelAddr ( Addr(..) ) import MutableArray ( MutableArray(..) ) #else import PrelArr ( STArray(..), newSTArray ) -import IOExts ( hPutBuf, hPutBufBA ) +import IOExts ( hPutBufFull, hPutBufBAFull ) #endif -- ForeignObj is now exported abstractly. @@ -639,8 +639,7 @@ hPutFS handle (FastString _ l# ba#) | otherwise = hPutBufBA handle (ByteArray bot bot ba#) (I# l#) #else | otherwise = do mba <- stToIO $ unsafeThawByteArray (ByteArray (bot::Int) bot ba#) - hPutBufBA handle mba (I# l#) - return () + hPutBufBAFull handle mba (I# l#) #endif where bot = error "hPutFS.ba" @@ -649,8 +648,11 @@ hPutFS handle (FastString _ l# ba#) hPutFS handle (CharStr a# l#) | l# ==# 0# = return () - | otherwise = do hPutBuf handle (A# a#) (I# l#) ; return () - +#if __GLASGOW_HASKELL__ < 407 + | otherwise = hPutBuf handle (A# a#) (I# l#) +#else + | otherwise = hPutBufFull handle (A# a#) (I# l#) +#endif #endif \end{code}