[project @ 2002-08-03 19:32:16 by reid]

[ghc-base.git] / include / CTypes.h

diff --git a/include/CTypes.h b/include/CTypes.h
index 9827d9d..cc0ea74 100644 (file)
--- a/include/CTypes.h
+++ b/include/CTypes.h
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: CTypes.h,v 1.2 2001/12/21 15:07:26 simonmar Exp $
+ * $Id: CTypes.h,v 1.3 2002/08/03 19:32:17 reid Exp $
  *
  * Dirty CPP hackery for CTypes/CTypesISO
  *
@@ -21,7 +21,7 @@ INSTANCE_NUM(T) ; \
 INSTANCE_READ(T) ; \
 INSTANCE_SHOW(T) ; \
 INSTANCE_ENUM(T) ; \
-INSTANCE_TYPEABLE(T,C,S) ;
+INSTANCE_TYPEABLE0(T,C,S) ;
 
 #define INTEGRAL_TYPE(T,C,S,B) \
 NUMERIC_TYPE(T,C,S,B) ; \
@@ -38,6 +38,10 @@ INSTANCE_FLOATING(T) ; \
 INSTANCE_REALFRAC(T) ; \
 INSTANCE_REALFLOAT(T)
 
+#ifndef __GLASGOW_HASKELL__
+#define fakeMap map
+#endif
+
 #define INSTANCE_READ(T) \
 instance Read T where { \
    readsPrec p s = fakeMap (\(x, t) -> (T x, t)) (readsPrec p s) }
@@ -56,12 +60,6 @@ instance Num T where { \
    signum  (T i) = T (signum i) ; \
    fromInteger x = T (fromInteger x) }
 
-#define INSTANCE_TYPEABLE(T,C,S) \
-C :: TyCon ; \
-C = mkTyCon S ; \
-instance Typeable T where { \
-  typeOf _ = mkAppTy C [] }
-
 #define INSTANCE_BOUNDED(T) \
 instance Bounded T where { \
    minBound = T minBound ; \