1. Bryan O'Sullivan
  2. bloomfilter

Commits

Bryan O'Sullivan  committed 342311f

Make GHC 7.4.1 happier

  • Participants
  • Parent commits 86f840a
  • Branches default

Comments (0)

Files changed (2)

File Data/BloomFilter/Array.hs

View file
-{-# LANGUAGE FlexibleContexts, ForeignFunctionInterface, MagicHash,
+{-# LANGUAGE CPP, FlexibleContexts, ForeignFunctionInterface, MagicHash,
              Rank2Types, UnliftedFFITypes #-}
 
 module Data.BloomFilter.Array (newArray) where
 
 import Control.Monad.ST (ST, unsafeIOToST)
 import Data.Array.Base (MArray, STUArray(..), unsafeNewArray_)
+#if __GLASGOW_HASKELL__ >= 704
+import Foreign.C.Types (CInt(..), CSize(..))
+#else
 import Foreign.C.Types (CInt, CSize)
+#endif
 import Foreign.Ptr (Ptr)
 import GHC.Base (MutableByteArray#)
 

File tests/QCSupport.hs

View file
-{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE CPP, GeneralizedNewtypeDeriving #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module QCSupport
 instance Arbitrary Ordering where
     arbitrary = oneof [return LT, return GT, return EQ]
 
+-- For some reason, MIN_VERSION_random doesn't work here :-(
+#if __GLASGOW_HASKELL__ < 704
 integralRandomR :: (Integral a, RandomGen g) => (a, a) -> g -> (a, g)
 integralRandomR (a,b) g = case randomR (fromIntegral a :: Int,
                                         fromIntegral b :: Int) g
 instance Random Int64 where
   randomR = integralRandomR
   random = randomR (minBound,maxBound)
+#endif
 
 instance Arbitrary LB.ByteString where
     arbitrary = sized $ \n -> resize (round (sqrt (toEnum n :: Double)))