diff options
author | Alberto Ruiz <aruiz@um.es> | 2011-12-25 03:33:01 -0800 |
---|---|---|
committer | Alberto Ruiz <aruiz@um.es> | 2011-12-25 03:33:01 -0800 |
commit | ea4da824ebc0ad09431aa276d8d44e4908e542c0 (patch) | |
tree | 950e968a34d46011476bb7fe0adf25c2f6c37ae4 /lib/Data | |
parent | c3bda2d38c432fb53ce456cba295b097fd4d6ad1 (diff) | |
parent | 43956aff360476d095b03fbbdef20f18df2dc933 (diff) |
Merge pull request #1 from basvandijk/master
Fix build on GHC-7.4.1-rc1 and some other patches
Diffstat (limited to 'lib/Data')
-rw-r--r-- | lib/Data/Packed/Internal/Matrix.hs | 2 | ||||
-rw-r--r-- | lib/Data/Packed/Internal/Signatures.hs | 6 | ||||
-rw-r--r-- | lib/Data/Packed/Internal/Vector.hs | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs index d5fa5a0..5d05e50 100644 --- a/lib/Data/Packed/Internal/Matrix.hs +++ b/lib/Data/Packed/Internal/Matrix.hs | |||
@@ -44,7 +44,7 @@ import Foreign.Marshal.Array(newArray) | |||
44 | import Foreign.Ptr(Ptr, castPtr) | 44 | import Foreign.Ptr(Ptr, castPtr) |
45 | import Foreign.Storable(Storable, peekElemOff, pokeElemOff, poke, sizeOf) | 45 | import Foreign.Storable(Storable, peekElemOff, pokeElemOff, poke, sizeOf) |
46 | import Data.Complex(Complex) | 46 | import Data.Complex(Complex) |
47 | import Foreign.C.Types(CInt, CChar) | 47 | import Foreign.C.Types |
48 | import Foreign.C.String(newCString) | 48 | import Foreign.C.String(newCString) |
49 | import System.IO.Unsafe(unsafePerformIO) | 49 | import System.IO.Unsafe(unsafePerformIO) |
50 | 50 | ||
diff --git a/lib/Data/Packed/Internal/Signatures.hs b/lib/Data/Packed/Internal/Signatures.hs index b81efa4..2835720 100644 --- a/lib/Data/Packed/Internal/Signatures.hs +++ b/lib/Data/Packed/Internal/Signatures.hs | |||
@@ -14,9 +14,9 @@ | |||
14 | 14 | ||
15 | module Data.Packed.Internal.Signatures where | 15 | module Data.Packed.Internal.Signatures where |
16 | 16 | ||
17 | import Foreign | 17 | import Foreign.Ptr(Ptr) |
18 | import Data.Complex | 18 | import Data.Complex(Complex) |
19 | import Foreign.C.Types | 19 | import Foreign.C.Types(CInt) |
20 | 20 | ||
21 | type PF = Ptr Float -- | 21 | type PF = Ptr Float -- |
22 | type PD = Ptr Double -- | 22 | type PD = Ptr Double -- |
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs index 43b3fd8..b9dba8e 100644 --- a/lib/Data/Packed/Internal/Vector.hs +++ b/lib/Data/Packed/Internal/Vector.hs | |||
@@ -38,7 +38,7 @@ import Foreign.ForeignPtr(ForeignPtr, castForeignPtr) | |||
38 | import Foreign.Ptr(Ptr) | 38 | import Foreign.Ptr(Ptr) |
39 | import Foreign.Storable(Storable, peekElemOff, pokeElemOff, sizeOf) | 39 | import Foreign.Storable(Storable, peekElemOff, pokeElemOff, sizeOf) |
40 | import Foreign.C.String | 40 | import Foreign.C.String |
41 | import Foreign.C.Types(CInt,CChar) | 41 | import Foreign.C.Types |
42 | import Data.Complex | 42 | import Data.Complex |
43 | import Control.Monad(when) | 43 | import Control.Monad(when) |
44 | import System.IO.Unsafe(unsafePerformIO) | 44 | import System.IO.Unsafe(unsafePerformIO) |