projects
/
haskell-directory.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-07-31 09:28:47 by ralf]
[haskell-directory.git]
/
Foreign
/
C
/
TypesISO.hs
diff --git
a/Foreign/C/TypesISO.hs
b/Foreign/C/TypesISO.hs
index
65aa789
..
ab2c928
100644
(file)
--- a/
Foreign/C/TypesISO.hs
+++ b/
Foreign/C/TypesISO.hs
@@
-14,14
+14,22
@@
--
-----------------------------------------------------------------------------
--
-----------------------------------------------------------------------------
+-- #hide
module Foreign.C.TypesISO
module Foreign.C.TypesISO
+#ifndef __NHC__
( -- Integral types, instances of: Eq, Ord, Num, Read, Show, Enum,
-- Typeable, Storable, Bounded, Real, Integral, Bits
( -- Integral types, instances of: Eq, Ord, Num, Read, Show, Enum,
-- Typeable, Storable, Bounded, Real, Integral, Bits
- CPtrdiff(..), CSize(..), CWchar(..), CSigAtomic(..)
+ CPtrdiff, CSize, CWchar, CSigAtomic
-- Numeric types, instances of: Eq, Ord, Num, Read, Show, Enum,
-- Typeable, Storable
-- Numeric types, instances of: Eq, Ord, Num, Read, Show, Enum,
-- Typeable, Storable
+ , CClock, CTime
+#else
+ ( -- For nhc98, these are exported non-abstractly to work around
+ -- an interface-file problem.
+ CPtrdiff(..), CSize(..), CWchar(..), CSigAtomic(..)
, CClock(..), CTime(..)
, CClock(..), CTime(..)
+#endif
-- Instances of: Eq and Storable
, CFile, CFpos, CJmpBuf
-- Instances of: Eq and Storable
, CFile, CFpos, CJmpBuf
@@
-44,7
+52,7
@@
import NHC.FFI
import Data.Bits ( Bits(..) )
import Data.Int
import Data.Word
import Data.Bits ( Bits(..) )
import Data.Int
import Data.Word
-import Data.Dynamic
+import Data.Typeable
import Foreign.Storable
#ifdef __GLASGOW_HASKELL__
import Foreign.Storable
#ifdef __GLASGOW_HASKELL__
@@
-59,7
+67,7
@@
import Control.Monad
import Foreign.Ptr
#endif
import Foreign.Ptr
#endif
-#include "Dynamic.h"
+#include "Typeable.h"
#include "CTypes.h"
INTEGRAL_TYPE(CPtrdiff,tyConCPtrdiff,"CPtrdiff",HTYPE_PTRDIFF_T)
#include "CTypes.h"
INTEGRAL_TYPE(CPtrdiff,tyConCPtrdiff,"CPtrdiff",HTYPE_PTRDIFF_T)