From: simonmar <unknown>
Date: Mon, 13 Aug 2001 10:27:27 +0000 (+0000)
Subject: [project @ 2001-08-13 10:27:27 by simonmar]
X-Git-Tag: Approximately_9120_patches~1279
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=4713dad87e800c5dda5fd75d2fe36e91a8181624;p=ghc-hetmet.git

[project @ 2001-08-13 10:27:27 by simonmar]
Don't use packString for GHC > 5.00
---

diff --git a/glafp-utils/nofib-analyse/Printf.lhs b/glafp-utils/nofib-analyse/Printf.lhs
index feeea80..1a8aa4d 100644
--- a/glafp-utils/nofib-analyse/Printf.lhs
+++ b/glafp-utils/nofib-analyse/Printf.lhs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: Printf.lhs,v 1.3 2001/08/07 11:13:46 simonmar Exp $
+-- $Id: Printf.lhs,v 1.4 2001/08/13 10:27:27 simonmar Exp $
 
 -- (c) Simon Marlow 1997-2001
 -----------------------------------------------------------------------------
@@ -43,9 +43,10 @@
 
 #else
 
->		allocaBytes bUFSIZE $ \buf -> do
->		snprintf buf (fromIntegral bUFSIZE) (packString format) num
->		peekCString buf
+>		allocaBytes bUFSIZE $ \buf ->
+>		  withCString format $ \cformat -> do
+>		    snprintf buf (fromIntegral bUFSIZE) cformat num
+>		    peekCString buf
 
 #endif
 
@@ -69,14 +70,13 @@
 > if_maybe Nothing  f = []
 > if_maybe (Just s) f = f s
 
-> type PackedString = ByteArray Int
-
 #if __GLASGOW_HASKELL__ < 500
 
+> type PackedString = ByteArray Int
 > foreign import unsafe snprintf :: Addr -> CSize -> PackedString -> Float -> IO ()
 
 #else
 
-> foreign import unsafe snprintf :: CString -> CSize -> PackedString -> Float -> IO ()
+> foreign import unsafe snprintf :: CString -> CSize -> CString -> Float -> IO ()
 
 #endif