[project @ 2003-09-16 17:50:15 by panne]

Make "one of the most hammered bits in the whole compiler" (quotation
from the source code :-) compile without _ccall_

diff --git a/ghc/compiler/basicTypes/UniqSupply.lhs b/ghc/compiler/basicTypes/UniqSupply.lhs
index 86cf320..2b29335 100644 (file)
--- a/ghc/compiler/basicTypes/UniqSupply.lhs
+++ b/ghc/compiler/basicTypes/UniqSupply.lhs
@@ -79,11 +79,19 @@ mkSplitUniqSupply (C# c#)
                return (MkSplitUniqSupply uniq s1 s2)
            )
 
-       mk_unique = _ccall_ genSymZh            >>= \ (W# u#) ->
+       mk_unique =
+#if __GLASGOW_HASKELL__ < 603
+                   _ccall_
+#endif
+                   genSymZh            >>= \ (W# u#) ->
                    return (I# (w2i (mask# `or#` u#)))
     in
     mk_supply#
 
+#if __GLASGOW_HASKELL__ >= 603
+foreign import ccall unsafe "genSymZh" genSymZh :: IO Word
+#endif
+
 splitUniqSupply (MkSplitUniqSupply _ s1 s2) = (s1, s2)
 \end{code}