[project @ 2002-08-29 11:29:40 by simonmar]

Foreign.C.TypesISO has been merged into Foreign.C.Types now.

diff --git a/Foreign/C.hs b/Foreign/C.hs
index 7fb0e3c..6d6409f 100644 (file)
--- a/Foreign/C.hs
+++ b/Foreign/C.hs
@@ -15,12 +15,10 @@
 
 module Foreign.C
         ( module Foreign.C.Types
-       , module Foreign.C.TypesISO
        , module Foreign.C.String
        , module Foreign.C.Error
         ) where
 
 import Foreign.C.Types
-import Foreign.C.TypesISO
 import Foreign.C.String
 import Foreign.C.Error

diff --git a/Foreign/C/Types.hs b/Foreign/C/Types.hs
index df1b989..e953d4a 100644 (file)
--- a/Foreign/C/Types.hs
+++ b/Foreign/C/Types.hs
@@ -19,16 +19,24 @@ module Foreign.C.Types
          CChar(..),  CSChar(..),  CUChar(..)
        , CShort(..), CUShort(..), CInt(..),   CUInt(..)
        , CLong(..),  CULong(..)
+       , CPtrdiff(..), CSize(..), CWchar(..), CSigAtomic(..)
 #ifndef __HUGS__
         , CLLong(..), CULLong(..)
 #endif
+         -- Numeric types, instances of: Eq, Ord, Num, Read, Show, Enum,
+         -- Typeable, Storable
+       , CClock(..),   CTime(..)
 
          -- Floating types, instances of: Eq, Ord, Num, Read, Show, Enum,
          -- Typeable, Storable, Real, Fractional, Floating, RealFrac,
          -- RealFloat 
        , CFloat(..),  CDouble(..), CLDouble(..)
+
+          -- Instances of: Eq and Storable
+       , CFile,        CFpos,     CJmpBuf
        ) where
 
+import Foreign.C.TypesISO
 import Data.Bits       ( Bits(..) )
 import Data.Int                ( Int8,  Int16,  Int32,  Int64  )
 import Data.Word       ( Word8, Word16, Word32, Word64 )