From: malcolm <unknown>
Date: Mon, 22 Mar 2004 14:48:57 +0000 (+0000)
Subject: [project @ 2004-03-22 14:48:56 by malcolm]
X-Git-Tag: nhc98-1-18-release~339
X-Git-Url: http://git.megacz.com/?p=ghc-base.git;a=commitdiff_plain;h=d4039901986f6991c23f0469a40148e8150b0f1e

[project @ 2004-03-22 14:48:56 by malcolm]
For nhc98, at last include the Typeable macros which define the instance decls.
---

diff --git a/Data/Dynamic.hs b/Data/Dynamic.hs
index 31c0199..a43cc18 100644
--- a/Data/Dynamic.hs
+++ b/Data/Dynamic.hs
@@ -64,10 +64,10 @@ unsafeCoerce = unsafeCoerce#
 #ifdef __NHC__
 import NonStdUnsafeCoerce (unsafeCoerce)
 import NHC.IOExtras (IORef,newIORef,readIORef,writeIORef,unsafePerformIO)
-#else
-#include "Typeable.h"
 #endif
 
+#include "Typeable.h"
+
 -------------------------------------------------------------
 --
 --		The type Dynamic
@@ -88,9 +88,7 @@ import NHC.IOExtras (IORef,newIORef,readIORef,writeIORef,unsafePerformIO)
 data Dynamic = Dynamic TypeRep Obj
 #endif
 
-#ifndef __NHC__
 INSTANCE_TYPEABLE0(Dynamic,dynamicTc,"Dynamic")
-#endif
 
 instance Show Dynamic where
    -- the instance just prints the type representation.
diff --git a/Data/Typeable.hs b/Data/Typeable.hs
index d537a0e..ff2b304 100644
--- a/Data/Typeable.hs
+++ b/Data/Typeable.hs
@@ -106,10 +106,14 @@ unsafeCoerce = unsafeCoerce#
 #ifdef __NHC__
 import NonStdUnsafeCoerce (unsafeCoerce)
 import NHC.IOExtras (IORef,newIORef,readIORef,writeIORef,unsafePerformIO)
+import IO (Handle)
+import Ratio (Ratio)
+import NHC.FFI (Ptr,StablePtr)
 #else
-#include "Typeable.h"
 #endif
 
+#include "Typeable.h"
+
 #ifndef __HUGS__
 
 -------------------------------------------------------------
@@ -444,7 +448,6 @@ gcast2 x = r
 --
 -------------------------------------------------------------
 
-#ifndef __NHC__
 INSTANCE_TYPEABLE1([],listTc,"[]")
 INSTANCE_TYPEABLE1(Maybe,maybeTc,"Maybe")
 INSTANCE_TYPEABLE1(Ratio,ratioTc,"Ratio")
@@ -452,6 +455,7 @@ INSTANCE_TYPEABLE2(Either,eitherTc,"Either")
 INSTANCE_TYPEABLE2((->),funTc,"->")
 INSTANCE_TYPEABLE1(IO,ioTc,"IO")
 INSTANCE_TYPEABLE0((),unitTc,"()")
+#ifndef __NHC__
 INSTANCE_TYPEABLE2((,),pairTc,",")
 INSTANCE_TYPEABLE3((,,),tup3Tc,",,")
 
@@ -479,10 +483,10 @@ tup7Tc = mkTyCon ",,,,,"
 instance Typeable7 (,,,,,,) where
   typeOf7 tu = mkTyConApp tup7Tc []
 
+#endif /* __NHC__ */
 INSTANCE_TYPEABLE1(Ptr,ptrTc,"Foreign.Ptr.Ptr")
 INSTANCE_TYPEABLE1(StablePtr,stableptrTc,"Foreign.StablePtr.StablePtr")
 INSTANCE_TYPEABLE1(IORef,iorefTc,"Data.IORef.IORef")
-#endif /* ! __NHC__ */
 
 -------------------------------------------------------
 --
@@ -490,7 +494,6 @@ INSTANCE_TYPEABLE1(IORef,iorefTc,"Data.IORef.IORef")
 --
 -------------------------------------------------------
 
-#ifndef __NHC__
 INSTANCE_TYPEABLE0(Bool,boolTc,"Bool")
 INSTANCE_TYPEABLE0(Char,charTc,"Char")
 INSTANCE_TYPEABLE0(Float,floatTc,"Float")
@@ -512,7 +515,6 @@ INSTANCE_TYPEABLE0(Word64,word64Tc,"Word64")
 
 INSTANCE_TYPEABLE0(TyCon,tyconTc,"TyCon")
 INSTANCE_TYPEABLE0(TypeRep,typeRepTc,"TypeRep")
-#endif /* !__NHC__ */
 
 #ifdef __GLASGOW_HASKELL__
 INSTANCE_TYPEABLE0(Word,wordTc,"Word" )
diff --git a/Makefile.nhc98 b/Makefile.nhc98
index 2151abe..2d753da 100644
--- a/Makefile.nhc98
+++ b/Makefile.nhc98
@@ -1,5 +1,5 @@
 THISPKG	= base
-SEARCH	= -I$(TOPDIR)/targets/$(MACHINE)
+SEARCH	= -I$(TOPDIR)/targets/$(MACHINE) -Iinclude
 EXTRA_H_FLAGS = +RTS -K6M -RTS
 
 SRCS	= \