diff --git a/src/Data/Binary/FloatCast.hs b/src/Data/Binary/FloatCast.hs index 7404836..b12a218 100644 --- a/src/Data/Binary/FloatCast.hs +++ b/src/Data/Binary/FloatCast.hs @@ -23,19 +23,9 @@ import Data.Word (Word32, Word64) #if defined(__GLASGOW_HASKELL__) import GHC.Float (castWord32ToFloat, castFloatToWord32, castWord64ToDouble, castDoubleToWord64) #elif defined(__MHS__) -import Primitives (primUnsafeCoerce, primWordToFloatRaw, primWordFromFloatRaw, primWord64ToDoubleRaw, primWord64FromDoubleRaw) - -castWord32ToFloat :: Word32 -> Float -castWord32ToFloat = primWordToFloatRaw . primUnsafeCoerce - -castFloatToWord32 :: Float -> Word32 -castFloatToWord32 = primUnsafeCoerce . primWordFromFloatRaw - -castWord64ToDouble :: Word64 -> Double -castWord64ToDouble = primWord64ToDoubleRaw - -castDoubleToWord64 :: Double -> Word64 -castDoubleToWord64 = primWord64FromDoubleRaw +-- XXX: use these imports for GHC as well, once they're available +import Data.Float (castWord32ToFloat, castFloatToWord32) +import Data.Double (castWord64ToDouble, castDoubleToWord64) #endif floatToWord :: Float -> Word32 diff --git a/src/Data/Binary/Internal.hs b/src/Data/Binary/Internal.hs index 3e47bed..13621d4 100644 --- a/src/Data/Binary/Internal.hs +++ b/src/Data/Binary/Internal.hs @@ -4,14 +4,14 @@ module Data.Binary.Internal ( accursedUnutterablePerformIO ) where #if defined(__MHS__) -import Primitives (primPerformIO) +import System.IO.Unsafe (unsafePerformIO) accursedUnutterablePerformIO :: IO a -> a -accursedUnutterablePerformIO = primPerformIO +accursedUnutterablePerformIO = unsafePerformIO #elif MIN_VERSION_bytestring(0,10,6) -import Data.ByteString.Internal( accursedUnutterablePerformIO ) +import Data.ByteString.Internal (accursedUnutterablePerformIO) #else -import Data.ByteString.Internal( inlinePerformIO ) +import Data.ByteString.Internal (inlinePerformIO) {-# INLINE accursedUnutterablePerformIO #-} -- | You must be truly desperate to come to me for help.