remove warnings in glpk and special (Bas van Dijk's method)

52 files changed, 70 insertions, 83 deletions

diff --git a/Setup.lhs b/Setup.lhs
index 6f71194..e3f9847 100644
--- a/Setup.lhs
+++ b/Setup.lhs
@@ -16,4 +16,3 @@
 >     let pkg_descr = localPkgDescr binfo
 >     return $ binfo { localPkgDescr = updatePackageDescription pbi pkg_descr }
 
-
diff --git a/hmatrix.cabal b/hmatrix.cabal
index 79ac491..906e4cf 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -23,7 +23,7 @@ Description:        Purely functional interface to basic linear algebra
 Category:           Math
 tested-with:        GHC ==7.4
 
-cabal-version:      >=1.6
+cabal-version:      >=1.8
 
 build-type:         Custom
 
@@ -148,16 +148,9 @@ library
 
  -- ghc-prof-options:   -auto
 
-
-    if impl(ghc < 7.4)
-        ghc-options:  -Wall -fno-warn-missing-signatures
-                            -fno-warn-orphans
-                            -fno-warn-unused-binds
-                            -fno-warn-dodgy-imports
-    else 
-        ghc-options:  -Wall -fno-warn-missing-signatures
-                            -fno-warn-orphans
-                            -fno-warn-unused-binds
+    ghc-options:  -Wall -fno-warn-missing-signatures
+                        -fno-warn-orphans
+                        -fno-warn-unused-binds
 
     if flag(unsafe)
         cpp-options: -DUNSAFE
@@ -186,9 +179,6 @@ library
     if impl(ghc == 7.0.1)
         cpp-options: -DNONORMVTEST
 
-    if impl(ghc < 7.4)
-        cpp-options: -DNOPOLYKINDS -DABSTRACTCINT
-
     if flag(mkl)
       if arch(x86_64)
         extra-libraries:   gsl mkl_lapack mkl_intel_lp64 mkl_sequential mkl_core
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 9fbaf6d..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)
 import Foreign.Ptr(Ptr, castPtr)
 import Foreign.Storable(Storable, peekElemOff, pokeElemOff, poke, sizeOf)
 import Data.Complex(Complex)
-import Foreign.C.Types(CInt(..), CChar)
+import Foreign.C.Types
 import Foreign.C.String(newCString)
 import System.IO.Unsafe(unsafePerformIO)
 
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 @@
 
 module Data.Packed.Internal.Signatures where
 
-import Foreign
-import Data.Complex
-import Foreign.C.Types
+import Foreign.Ptr(Ptr)
+import Data.Complex(Complex)
+import Foreign.C.Types(CInt)
 
 type PF = Ptr Float                             --
 type PD = Ptr Double                            --
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index e85ba6e..936479d 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -39,7 +39,7 @@ import Foreign.ForeignPtr(ForeignPtr, castForeignPtr)
 import Foreign.Ptr(Ptr)
 import Foreign.Storable(Storable, peekElemOff, pokeElemOff, sizeOf)
 import Foreign.C.String
-import Foreign.C.Types(CInt(..),CChar)
+import Foreign.C.Types
 import Data.Complex
 import Control.Monad(when)
 import System.IO.Unsafe(unsafePerformIO)
diff --git a/lib/Numeric/ContainerBoot.hs b/lib/Numeric/ContainerBoot.hs
index 6ce4760..d50dd36 100644
--- a/lib/Numeric/ContainerBoot.hs
+++ b/lib/Numeric/ContainerBoot.hs
@@ -1,11 +1,9 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE UndecidableInstances #-}
-#ifndef NOPOLYKINDS
-{-# LANGUAGE PolyKinds #-}
-#endif
 
 -----------------------------------------------------------------------------
 -- |
@@ -55,12 +53,12 @@ import Numeric.LinearAlgebra.LAPACK(multiplyR,multiplyC,multiplyF,multiplyQ)
 
 -------------------------------------------------------------------
 
-type family IndexOf c
+type family IndexOf (c :: * -> *)
 
 type instance IndexOf Vector = Int
 type instance IndexOf Matrix = (Int,Int)
 
-type family ArgOf c a
+type family ArgOf (c :: * -> *) a
 
 type instance ArgOf Vector a = a -> a
 type instance ArgOf Matrix a = a -> a -> a
diff --git a/lib/Numeric/GSL/Differentiation.hs b/lib/Numeric/GSL/Differentiation.hs
index 1df58a1..ab5eb50 100644
--- a/lib/Numeric/GSL/Differentiation.hs
+++ b/lib/Numeric/GSL/Differentiation.hs
@@ -22,7 +22,7 @@ module Numeric.GSL.Differentiation (
     derivBackward
 ) where
 
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Foreign.Marshal.Alloc(malloc, free)
 import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr)
 import Foreign.Storable(peek)
diff --git a/lib/Numeric/GSL/Fitting.hs b/lib/Numeric/GSL/Fitting.hs
index da5c0fc..79db23f 100644
--- a/lib/Numeric/GSL/Fitting.hs
+++ b/lib/Numeric/GSL/Fitting.hs
@@ -54,7 +54,7 @@ import Numeric.LinearAlgebra
 import Numeric.GSL.Internal
 
 import Foreign.Ptr(FunPtr, freeHaskellFunPtr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import System.IO.Unsafe(unsafePerformIO)
 
 -------------------------------------------------------------------------
diff --git a/lib/Numeric/GSL/Fourier.hs b/lib/Numeric/GSL/Fourier.hs
index 5cc50dc..71bc8a1 100644
--- a/lib/Numeric/GSL/Fourier.hs
+++ b/lib/Numeric/GSL/Fourier.hs
@@ -22,7 +22,7 @@ module Numeric.GSL.Fourier (
 
 import Data.Packed.Internal
 import Data.Complex
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import System.IO.Unsafe (unsafePerformIO)
 
 genfft code v = unsafePerformIO $ do
diff --git a/lib/Numeric/GSL/Integration.hs b/lib/Numeric/GSL/Integration.hs
index a59862a..a0e922b 100644
--- a/lib/Numeric/GSL/Integration.hs
+++ b/lib/Numeric/GSL/Integration.hs
@@ -20,7 +20,7 @@ module Numeric.GSL.Integration (
     integrateQAGS
 ) where
 
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Foreign.Marshal.Alloc(malloc, free)
 import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr)
 import Foreign.Storable(peek)
diff --git a/lib/Numeric/GSL/Internal.hs b/lib/Numeric/GSL/Internal.hs
index a6c81ee..303e7e1 100644
--- a/lib/Numeric/GSL/Internal.hs
+++ b/lib/Numeric/GSL/Internal.hs
@@ -16,7 +16,7 @@ import Data.Packed.Internal
 
 import Foreign.Marshal.Array(copyArray)
 import Foreign.Ptr(Ptr, FunPtr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import System.IO.Unsafe(unsafePerformIO)
 
 iv :: (Vector Double -> Double) -> (CInt -> Ptr Double -> Double)
diff --git a/lib/Numeric/GSL/Minimization.hs b/lib/Numeric/GSL/Minimization.hs
index 6fac640..88acfac 100644
--- a/lib/Numeric/GSL/Minimization.hs
+++ b/lib/Numeric/GSL/Minimization.hs
@@ -65,7 +65,7 @@ import Data.Packed.Matrix
 import Numeric.GSL.Internal
 
 import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import System.IO.Unsafe(unsafePerformIO)
 
 ------------------------------------------------------------------------
diff --git a/lib/Numeric/GSL/ODE.hs b/lib/Numeric/GSL/ODE.hs
index 86c8bab..2251acd 100644
--- a/lib/Numeric/GSL/ODE.hs
+++ b/lib/Numeric/GSL/ODE.hs
@@ -36,7 +36,7 @@ import Data.Packed.Internal
 import Numeric.GSL.Internal
 
 import Foreign.Ptr(FunPtr, nullFunPtr, freeHaskellFunPtr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import System.IO.Unsafe(unsafePerformIO)
 
 -------------------------------------------------------------------------
diff --git a/lib/Numeric/GSL/Polynomials.hs b/lib/Numeric/GSL/Polynomials.hs
index c0318d7..b21b1b6 100644
--- a/lib/Numeric/GSL/Polynomials.hs
+++ b/lib/Numeric/GSL/Polynomials.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE ForeignFunctionInterface #-}
+{-# LANGUAGE CPP, ForeignFunctionInterface #-}
 -----------------------------------------------------------------------------
 {- |
 Module      :  Numeric.GSL.Polynomials
@@ -19,13 +19,14 @@ module Numeric.GSL.Polynomials (
     polySolve
 ) where
 
-#ifndef ABSTRACTCINT
-import Foreign.C.Types(CInt(..))
-#endif
 import Data.Packed.Internal
 import Data.Complex
 import System.IO.Unsafe (unsafePerformIO)
 
+#if __GLASGOW_HASKELL__ >= 704
+import Foreign.C.Types (CInt(..))
+#endif
+
 {- | Solution of general polynomial equations, using /gsl_poly_complex_solve/. For example,
      the three solutions of x^3 + 8 = 0
 
diff --git a/lib/Numeric/GSL/Root.hs b/lib/Numeric/GSL/Root.hs
index 9969e8a..41f7fb3 100644
--- a/lib/Numeric/GSL/Root.hs
+++ b/lib/Numeric/GSL/Root.hs
@@ -52,9 +52,8 @@ module Numeric.GSL.Root (
 import Data.Packed.Internal
 import Data.Packed.Matrix
 import Numeric.GSL.Internal
-
-import  Foreign.Ptr(FunPtr, freeHaskellFunPtr)
-import Foreign.C.Types(CInt(..))
+import Foreign.Ptr(FunPtr, freeHaskellFunPtr)
+import Foreign.C.Types
 import System.IO.Unsafe(unsafePerformIO)
 
 -------------------------------------------------------------------------
diff --git a/lib/Numeric/GSL/Vector.hs b/lib/Numeric/GSL/Vector.hs
index d0f419b..b8c6d04 100644
--- a/lib/Numeric/GSL/Vector.hs
+++ b/lib/Numeric/GSL/Vector.hs
@@ -31,7 +31,7 @@ import Data.Complex
 import Foreign.Marshal.Alloc(free)
 import Foreign.Marshal.Array(newArray)
 import Foreign.Ptr(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import System.IO.Unsafe(unsafePerformIO)
 
 fromei x = fromIntegral (fromEnum x) :: CInt
diff --git a/lib/Numeric/LinearAlgebra/Algorithms.hs b/lib/Numeric/LinearAlgebra/Algorithms.hs
index 9806d6f..e2ecd4d 100644
--- a/lib/Numeric/LinearAlgebra/Algorithms.hs
+++ b/lib/Numeric/LinearAlgebra/Algorithms.hs
@@ -568,11 +568,19 @@ epslist = [ (fromIntegral k, golubeps k k) | k <- [1..]]
 
 geps delta = head [ k | (k,g) <- epslist, g<delta]
 
+
 {- | Matrix exponential. It uses a direct translation of Algorithm 11.3.1 in Golub & Van Loan,
      based on a scaled Pade approximation.
 -}
 expm :: Field t => Matrix t -> Matrix t
-expm m = iterate msq f !! j
+expm = expGolub
+
+expGolub :: ( Fractional t, Element t, Field t
+            , Normed Matrix t
+            , RealFrac (RealOf t)
+            , Floating (RealOf t)
+            ) => Matrix t -> Matrix t
+expGolub m = iterate msq f !! j
     where j = max 0 $ floor $ logBase 2 $ pnorm Infinity m
           a = m */ fromIntegral ((2::Int)^j)
           q = geps eps -- 7 steps
diff --git a/lib/Numeric/LinearAlgebra/LAPACK.hs b/lib/Numeric/LinearAlgebra/LAPACK.hs
index 14e121b..d1aa564 100644
--- a/lib/Numeric/LinearAlgebra/LAPACK.hs
+++ b/lib/Numeric/LinearAlgebra/LAPACK.hs
@@ -47,7 +47,7 @@ import Numeric.Conversion
 import Numeric.GSL.Vector(vectorMapValR, FunCodeSV(Scale))
 
 import Foreign.Ptr(nullPtr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Control.Monad(when)
 import System.IO.Unsafe(unsafePerformIO)
 
diff --git a/packages/glpk/hmatrix-glpk.cabal b/packages/glpk/hmatrix-glpk.cabal
index 3231ef7..f9655d4 100644
--- a/packages/glpk/hmatrix-glpk.cabal
+++ b/packages/glpk/hmatrix-glpk.cabal
@@ -30,10 +30,7 @@ library
 
     c-sources:          lib/Numeric/LinearProgramming/glpk.c
 
-    if impl(ghc < 7.4)
-        ghc-options:  -Wall -fno-warn-dodgy-imports
-    else 
-        ghc-options:  -Wall
+    ghc-options:  -Wall
 
     extra-libraries:    glpk
 
diff --git a/packages/glpk/lib/Numeric/LinearProgramming.hs b/packages/glpk/lib/Numeric/LinearProgramming.hs
index c8cb0e1..b832bac 100644
--- a/packages/glpk/lib/Numeric/LinearProgramming.hs
+++ b/packages/glpk/lib/Numeric/LinearProgramming.hs
@@ -71,7 +71,7 @@ import Numeric.LinearAlgebra hiding (i)
 import Data.Packed.Development
 import Foreign(Ptr)
 import System.IO.Unsafe(unsafePerformIO)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Data.List((\\),sortBy,nub)
 import Data.Function(on)
 
diff --git a/packages/special/hmatrix-special.cabal b/packages/special/hmatrix-special.cabal
index 25880a9..22e989f 100644
--- a/packages/special/hmatrix-special.cabal
+++ b/packages/special/hmatrix-special.cabal
@@ -66,11 +66,7 @@ library
 
     other-modules:      Numeric.GSL.Special.Internal
 
-    if impl(ghc < 7.4)
-        ghc-options:  -Wall -fno-warn-unused-binds
-                            -fno-warn-dodgy-imports
-    else 
-        ghc-options:  -Wall -fno-warn-orphans
+    ghc-options:  -Wall -fno-warn-unused-binds
                             
     if flag(safe-cheap)
         cpp-options: -DSAFE_CHEAP=safe
diff --git a/packages/special/lib/Numeric/GSL/Special/Airy.hs b/packages/special/lib/Numeric/GSL/Special/Airy.hs
index 2438b71..737de7c 100644
--- a/packages/special/lib/Numeric/GSL/Special/Airy.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Airy.hs
@@ -41,7 +41,7 @@ module Numeric.GSL.Special.Airy(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 airy_Ai_e :: Double -> Precision -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Bessel.hs b/packages/special/lib/Numeric/GSL/Special/Bessel.hs
index e88c3b0..4a80c28 100644
--- a/packages/special/lib/Numeric/GSL/Special/Bessel.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Bessel.hs
@@ -105,7 +105,7 @@ module Numeric.GSL.Special.Bessel(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..),CSize(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 bessel_J0_e :: Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Clausen.hs b/packages/special/lib/Numeric/GSL/Special/Clausen.hs
index 59547ec..80bd45c 100644
--- a/packages/special/lib/Numeric/GSL/Special/Clausen.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Clausen.hs
@@ -18,7 +18,7 @@ module Numeric.GSL.Special.Clausen(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 clausen_e :: Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Coulomb.hs b/packages/special/lib/Numeric/GSL/Special/Coulomb.hs
index c282d7b..218213a 100644
--- a/packages/special/lib/Numeric/GSL/Special/Coulomb.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Coulomb.hs
@@ -21,7 +21,7 @@ module Numeric.GSL.Special.Coulomb(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 hydrogenicR_1_e :: Double -> Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Coupling.hs b/packages/special/lib/Numeric/GSL/Special/Coupling.hs
index 390c6bb..326f53f 100644
--- a/packages/special/lib/Numeric/GSL/Special/Coupling.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Coupling.hs
@@ -24,7 +24,7 @@ module Numeric.GSL.Special.Coupling(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 coupling_3j_e :: CInt -> CInt -> CInt -> CInt -> CInt -> CInt -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Dawson.hs b/packages/special/lib/Numeric/GSL/Special/Dawson.hs
index 2486a57..9f73767 100644
--- a/packages/special/lib/Numeric/GSL/Special/Dawson.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Dawson.hs
@@ -18,7 +18,7 @@ module Numeric.GSL.Special.Dawson(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 dawson_e :: Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Debye.hs b/packages/special/lib/Numeric/GSL/Special/Debye.hs
index 5a54e37..7ca17e4 100644
--- a/packages/special/lib/Numeric/GSL/Special/Debye.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Debye.hs
@@ -28,7 +28,7 @@ module Numeric.GSL.Special.Debye(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 debye_1_e :: Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Dilog.hs b/packages/special/lib/Numeric/GSL/Special/Dilog.hs
index a7e8e86..32cceba 100644
--- a/packages/special/lib/Numeric/GSL/Special/Dilog.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Dilog.hs
@@ -21,7 +21,7 @@ module Numeric.GSL.Special.Dilog(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 dilog_e :: Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Elementary.hs b/packages/special/lib/Numeric/GSL/Special/Elementary.hs
index 710e0ce..e58a697 100644
--- a/packages/special/lib/Numeric/GSL/Special/Elementary.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Elementary.hs
@@ -19,7 +19,7 @@ module Numeric.GSL.Special.Elementary(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 multiply_e :: Double -> Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Ellint.hs b/packages/special/lib/Numeric/GSL/Special/Ellint.hs
index 0d171bf..365c366 100644
--- a/packages/special/lib/Numeric/GSL/Special/Ellint.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Ellint.hs
@@ -40,7 +40,7 @@ module Numeric.GSL.Special.Ellint(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 ellint_Kcomp_e :: Double -> Precision -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Elljac.hs b/packages/special/lib/Numeric/GSL/Special/Elljac.hs
index 18c7f06..553350c 100644
--- a/packages/special/lib/Numeric/GSL/Special/Elljac.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Elljac.hs
@@ -20,7 +20,7 @@ import System.IO.Unsafe
 import Foreign.Ptr
 import Foreign.Storable
 import Foreign.Marshal
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 
 elljac_e :: Double -> Double -> (Double,Double,Double)
 elljac_e u m = unsafePerformIO $ do
diff --git a/packages/special/lib/Numeric/GSL/Special/Erf.hs b/packages/special/lib/Numeric/GSL/Special/Erf.hs
index 69a5c9e..171a3c5 100644
--- a/packages/special/lib/Numeric/GSL/Special/Erf.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Erf.hs
@@ -28,7 +28,7 @@ module Numeric.GSL.Special.Erf(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 erfc_e :: Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Exp.hs b/packages/special/lib/Numeric/GSL/Special/Exp.hs
index 0cc2b1c..3b70078 100644
--- a/packages/special/lib/Numeric/GSL/Special/Exp.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Exp.hs
@@ -35,7 +35,7 @@ module Numeric.GSL.Special.Exp(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 exp_e :: Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Expint.hs b/packages/special/lib/Numeric/GSL/Special/Expint.hs
index be01007..06f4594 100644
--- a/packages/special/lib/Numeric/GSL/Special/Expint.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Expint.hs
@@ -44,7 +44,7 @@ module Numeric.GSL.Special.Expint(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 expint_E1_e :: Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Fermi_dirac.hs b/packages/special/lib/Numeric/GSL/Special/Fermi_dirac.hs
index a28b6e3..c39c096 100644
--- a/packages/special/lib/Numeric/GSL/Special/Fermi_dirac.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Fermi_dirac.hs
@@ -34,7 +34,7 @@ module Numeric.GSL.Special.Fermi_dirac(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 fermi_dirac_m1_e :: Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Gamma.hs b/packages/special/lib/Numeric/GSL/Special/Gamma.hs
index f5a573b..78115f1 100644
--- a/packages/special/lib/Numeric/GSL/Special/Gamma.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Gamma.hs
@@ -57,7 +57,7 @@ module Numeric.GSL.Special.Gamma(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 lngamma_e :: Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Gegenbauer.hs b/packages/special/lib/Numeric/GSL/Special/Gegenbauer.hs
index 78fbaf4..a3c998a 100644
--- a/packages/special/lib/Numeric/GSL/Special/Gegenbauer.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Gegenbauer.hs
@@ -24,7 +24,7 @@ module Numeric.GSL.Special.Gegenbauer(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 gegenpoly_1_e :: Double -> Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Hyperg.hs b/packages/special/lib/Numeric/GSL/Special/Hyperg.hs
index 958503f..ac237a5 100644
--- a/packages/special/lib/Numeric/GSL/Special/Hyperg.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Hyperg.hs
@@ -38,7 +38,7 @@ module Numeric.GSL.Special.Hyperg(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 hyperg_0F1_e :: Double -> Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Internal.hsc b/packages/special/lib/Numeric/GSL/Special/Internal.hsc
index 338ed40..e7c38e8 100644
--- a/packages/special/lib/Numeric/GSL/Special/Internal.hsc
+++ b/packages/special/lib/Numeric/GSL/Special/Internal.hsc
@@ -34,7 +34,7 @@ import Foreign.Ptr
 import Foreign.Marshal
 import System.IO.Unsafe(unsafePerformIO)
 import Data.Packed.Development(check,(//))
-import Foreign.C.Types(CSize,CInt)
+import Foreign.C.Types
 
 data Precision = PrecDouble | PrecSingle | PrecApprox
 
diff --git a/packages/special/lib/Numeric/GSL/Special/Laguerre.hs b/packages/special/lib/Numeric/GSL/Special/Laguerre.hs
index 33d7769..28b3d20 100644
--- a/packages/special/lib/Numeric/GSL/Special/Laguerre.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Laguerre.hs
@@ -24,7 +24,7 @@ module Numeric.GSL.Special.Laguerre(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 laguerre_1_e :: Double -> Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Lambert.hs b/packages/special/lib/Numeric/GSL/Special/Lambert.hs
index 4c410d7..44fbfb1 100644
--- a/packages/special/lib/Numeric/GSL/Special/Lambert.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Lambert.hs
@@ -20,7 +20,7 @@ module Numeric.GSL.Special.Lambert(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 lambert_W0_e :: Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Legendre.hs b/packages/special/lib/Numeric/GSL/Special/Legendre.hs
index 0042656..cb33e2e 100644
--- a/packages/special/lib/Numeric/GSL/Special/Legendre.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Legendre.hs
@@ -53,7 +53,7 @@ module Numeric.GSL.Special.Legendre(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 legendre_Pl_e :: CInt -> Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Log.hs b/packages/special/lib/Numeric/GSL/Special/Log.hs
index 46b6a0a..3becf15 100644
--- a/packages/special/lib/Numeric/GSL/Special/Log.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Log.hs
@@ -25,7 +25,7 @@ module Numeric.GSL.Special.Log(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 log_e :: Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Pow_int.hs b/packages/special/lib/Numeric/GSL/Special/Pow_int.hs
index bccdde7..08fd497 100644
--- a/packages/special/lib/Numeric/GSL/Special/Pow_int.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Pow_int.hs
@@ -18,7 +18,7 @@ module Numeric.GSL.Special.Pow_int(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 pow_int_e :: Double -> CInt -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Psi.hs b/packages/special/lib/Numeric/GSL/Special/Psi.hs
index b99817f..da53d1b 100644
--- a/packages/special/lib/Numeric/GSL/Special/Psi.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Psi.hs
@@ -29,7 +29,7 @@ module Numeric.GSL.Special.Psi(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 psi_int_e :: CInt -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Synchrotron.hs b/packages/special/lib/Numeric/GSL/Special/Synchrotron.hs
index 6b5cbf6..b3292a6 100644
--- a/packages/special/lib/Numeric/GSL/Special/Synchrotron.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Synchrotron.hs
@@ -20,7 +20,7 @@ module Numeric.GSL.Special.Synchrotron(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 synchrotron_1_e :: Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Transport.hs b/packages/special/lib/Numeric/GSL/Special/Transport.hs
index 4f3b469..b92b578 100644
--- a/packages/special/lib/Numeric/GSL/Special/Transport.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Transport.hs
@@ -24,7 +24,7 @@ module Numeric.GSL.Special.Transport(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 transport_2_e :: Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Trig.hs b/packages/special/lib/Numeric/GSL/Special/Trig.hs
index 2f1bda9..43fdc95 100644
--- a/packages/special/lib/Numeric/GSL/Special/Trig.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Trig.hs
@@ -39,7 +39,7 @@ module Numeric.GSL.Special.Trig(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 sin_e :: Double -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/Zeta.hs b/packages/special/lib/Numeric/GSL/Special/Zeta.hs
index b29b026..a57a918 100644
--- a/packages/special/lib/Numeric/GSL/Special/Zeta.hs
+++ b/packages/special/lib/Numeric/GSL/Special/Zeta.hs
@@ -30,7 +30,7 @@ module Numeric.GSL.Special.Zeta(
 ) where
 
 import Foreign(Ptr)
-import Foreign.C.Types(CInt(..))
+import Foreign.C.Types
 import Numeric.GSL.Special.Internal
 
 zeta_int_e :: CInt -> (Double,Double)
diff --git a/packages/special/lib/Numeric/GSL/Special/auto.hs b/packages/special/lib/Numeric/GSL/Special/auto.hs
index d3461b2..36947ad 100755
--- a/packages/special/lib/Numeric/GSL/Special/auto.hs
+++ b/packages/special/lib/Numeric/GSL/Special/auto.hs
@@ -66,7 +66,7 @@ main = do
     let exports = rep (")",") where") $ rep ("(\n","(\n  ") $ rep (",\n",", ") $ unlines $ ["("]++intersperse "," (map (\(Header _ n _) -> hName n) (filter safe parsed))++[")"]
     let defs = unlines $ map (showFull (name ++".h")) parsed
     let imports = "\nimport Foreign(Ptr)\n"
-                ++"import Foreign.C.Types(CInt(..))\n"
+                ++"import Foreign.C.Types\n"
                 ++"import Numeric.GSL.Special.Internal\n"
     let mod = modhead name ++ "module Numeric.GSL.Special."++ upperFirst name++exports++imports++defs
     writeFile (upperFirst name ++ ".hs") mod
diff --git a/packages/special/lib/Numeric/GSL/Special/autoall.sh b/packages/special/lib/Numeric/GSL/Special/autoall.sh
index 68a2d2d..18d0a6e 100755
--- a/packages/special/lib/Numeric/GSL/Special/autoall.sh
+++ b/packages/special/lib/Numeric/GSL/Special/autoall.sh
@@ -10,7 +10,6 @@ rm -f funs.txt
 ./auto.hs airy
 rep ') where' ', Precision(..)\n) where' Airy.hs
 ./auto.hs bessel
-rep 'Foreign.C.Types(CInt(..))' 'Foreign.C.Types(CInt(..),CSize(..))' Bessel.hs
 ./auto.hs clausen
 ./auto.hs coulomb
 ./auto.hs coupling