[project @ 2002-10-11 11:05:20 by malcolm]

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

diff --git a/Foreign/C/TypesISO.hs b/Foreign/C/TypesISO.hs
index 490a484..65aa789 100644 (file)
--- a/Foreign/C/TypesISO.hs
+++ b/Foreign/C/TypesISO.hs
@@ -3,7 +3,7 @@
 -- |
 -- Module      :  Foreign.C.TypesISO
 -- Copyright   :  (c) The FFI task force 2001
--- License     :  BSD-style (see the file libraries/core/LICENSE)
+-- License     :  BSD-style (see the file libraries/base/LICENSE)
 -- 
 -- Maintainer  :  ffi@haskell.org
 -- Stability   :  provisional
@@ -21,16 +21,31 @@ module Foreign.C.TypesISO
 
          -- Numeric types, instances of: Eq, Ord, Num, Read, Show, Enum,
          -- Typeable, Storable
-       , CClock(..),   CTime(..),
+       , CClock(..),   CTime(..)
 
           -- Instances of: Eq and Storable
        , CFile,        CFpos,     CJmpBuf
        ) where
 
+#ifdef __NHC__
+import NHC.FFI
+  ( CPtrdiff(..)
+  , CSize(..)
+  , CWchar(..)
+  , CSigAtomic(..)
+  , CClock(..)
+  , CTime(..)
+  , CFile
+  , CFpos
+  , CJmpBuf
+  )
+#else
+
 import Data.Bits       ( Bits(..) )
 import Data.Int
 import Data.Word
 import Data.Dynamic
+import Foreign.Storable
 
 #ifdef __GLASGOW_HASKELL__
 import GHC.Base
@@ -39,8 +54,12 @@ import GHC.Real
 import GHC.Show
 import GHC.Read
 import GHC.Num
+#else
+import Control.Monad
+import Foreign.Ptr
 #endif
 
+#include "Dynamic.h"
 #include "CTypes.h"
 
 INTEGRAL_TYPE(CPtrdiff,tyConCPtrdiff,"CPtrdiff",HTYPE_PTRDIFF_T)
@@ -71,10 +90,4 @@ data CJmpBuf = CJmpBuf
 -- C99 types which are still missing include:
 -- intptr_t, uintptr_t, intmax_t, uintmax_t, wint_t, wctrans_t, wctype_t
 
-#include "Dynamic.h"
-INSTANCE_TYPEABLE0(CPtrdiff,cPtrdiffTc,"CPtrdiff")
-INSTANCE_TYPEABLE0(CSize,cSizeTc,"CSize")
-INSTANCE_TYPEABLE0(CWchar,cWcharTc,"CWchar")
-INSTANCE_TYPEABLE0(CSigAtomic,cSigAtomicTc,"CSigAtomic")
-INSTANCE_TYPEABLE0(CClock,cClockTc,"CClock")
-INSTANCE_TYPEABLE0(CTime,cTimeTc,"CTime")
+#endif