[project @ 2003-05-23 08:59:46 by simonmar]

[ghc-base.git] / Foreign / C / Types.hs

diff --git a/Foreign/C/Types.hs b/Foreign/C/Types.hs
index 89251d3..15b624a 100644 (file)
--- a/Foreign/C/Types.hs
+++ b/Foreign/C/Types.hs
@@ -9,28 +9,26 @@
 -- Stability   :  provisional
 -- Portability :  portable
 --
--- Mapping of C types to corresponding Haskell types. A cool hack...
+-- Mapping of C types to corresponding Haskell types.
 --
 -----------------------------------------------------------------------------
 
 module Foreign.C.Types
        ( -- Integral types, instances of: Eq, Ord, Num, Read, Show, Enum,
          -- Typeable, Storable, Bounded, Real, Integral, Bits
-         CChar(..),  CSChar(..),  CUChar(..)
-       , CShort(..), CUShort(..), CInt(..),   CUInt(..)
-       , CLong(..),  CULong(..)
-       , CPtrdiff(..), CSize(..), CWchar(..), CSigAtomic(..)
-#ifndef __HUGS__
-        , CLLong(..), CULLong(..)
-#endif
+         CChar,  CSChar,  CUChar
+       , CShort, CUShort, CInt,   CUInt
+       , CLong,  CULong
+       , CPtrdiff, CSize, CWchar, CSigAtomic
+        , CLLong, CULLong
          -- Numeric types, instances of: Eq, Ord, Num, Read, Show, Enum,
          -- Typeable, Storable
-       , CClock(..),   CTime(..)
+       , CClock,   CTime
 
          -- Floating types, instances of: Eq, Ord, Num, Read, Show, Enum,
          -- Typeable, Storable, Real, Fractional, Floating, RealFrac,
          -- RealFloat 
-       , CFloat(..),  CDouble(..), CLDouble(..)
+       , CFloat,  CDouble, CLDouble
 
           -- Instances of: Eq and Storable
        , CFile,        CFpos,     CJmpBuf
@@ -38,12 +36,12 @@ module Foreign.C.Types
 
 #ifdef __NHC__
 import NHC.FFI
-  ( CChar(..),  CSChar(..),  CUChar(..)
-  , CShort(..), CUShort(..), CInt(..),   CUInt(..)
-  , CLong(..),  CULong(..), CLLong(..), CULLong(..)
-  , CPtrdiff(..), CSize(..), CWchar(..), CSigAtomic(..)
-  , CClock(..),   CTime(..)
-  , CFloat(..),  CDouble(..), CLDouble(..)
+  ( CChar,  CSChar,  CUChar
+  , CShort, CUShort, CInt,   CUInt
+  , CLong,  CULong, CLLong, CULLong
+  , CPtrdiff, CSize, CWchar, CSigAtomic
+  , CClock,   CTime
+  , CFloat,  CDouble, CLDouble
   , CFile,        CFpos,     CJmpBuf
   , Storable(..)
   )
@@ -85,10 +83,8 @@ INTEGRAL_TYPE(CUInt,tyConCUInt,"CUInt",HTYPE_UNSIGNED_INT)
 INTEGRAL_TYPE(CLong,tyConCLong,"CLong",HTYPE_LONG)
 INTEGRAL_TYPE(CULong,tyConCULong,"CULong",HTYPE_UNSIGNED_LONG)
 
-#ifndef __HUGS__
 INTEGRAL_TYPE(CLLong,tyConCLLong,"CLLong",HTYPE_LONG_LONG)
 INTEGRAL_TYPE(CULLong,tyConCULLong,"CULLong",HTYPE_UNSIGNED_LONG_LONG)
-#endif
 
 {-# RULES
 "fromIntegral/a->CChar"   fromIntegral = \x -> CChar   (fromIntegral x)