projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
e0dc0bc
)
[project @ 2006-01-10 09:47:51 by simonmar]
author
simonmar
<unknown>
Tue, 10 Jan 2006 09:47:51 +0000
(09:47 +0000)
committer
simonmar
<unknown>
Tue, 10 Jan 2006 09:47:51 +0000
(09:47 +0000)
Fix compilation with GHC 6.2.x, hopefully
ghc/compiler/utils/FastString.lhs
patch
|
blob
|
history
diff --git
a/ghc/compiler/utils/FastString.lhs
b/ghc/compiler/utils/FastString.lhs
index
134bb95
..
28aa6b0
100644
(file)
--- 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}