From: simonmar <unknown>
Date: Tue, 10 Jan 2006 09:47:51 +0000 (+0000)
Subject: [project @ 2006-01-10 09:47:51 by simonmar]
X-Git-Tag: final_switch_to_darcs,_this_repo_is_now_live~44
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;ds=sidebyside;h=1607c878b9e27ac836c178b2c441996127e5d3e9;hp=e0dc0bc87a534b5a0329d3544c408c5f32d129a4;p=ghc-hetmet.git

[project @ 2006-01-10 09:47:51 by simonmar]
Fix compilation with GHC 6.2.x, hopefully
---

diff --git a/ghc/compiler/utils/FastString.lhs b/ghc/compiler/utils/FastString.lhs
index 134bb95..28aa6b0 100644
--- a/ghc/compiler/utils/FastString.lhs
+++ b/ghc/compiler/utils/FastString.lhs
@@ -455,6 +455,7 @@ pokeCAString ptr str =
   go str 0
 
 #if __GLASGOW_HASKELL__ < 600
+
 mallocForeignPtrBytes :: Int -> IO (ForeignPtr a)
 mallocForeignPtrBytes n = do
   r <- mallocBytes n
@@ -464,5 +465,10 @@ foreign import ccall unsafe "stdlib.h free"
   finalizerFree :: Ptr a -> IO ()
 
 peekCAStringLen = peekCStringLen
+
+#elif __GLASGOW_HASKELL__ <= 602
+
+peekCAStringLen = peekCStringLen
+
 #endif
 \end{code}