[project @ 2003-07-24 12:19:57 by ralf]

[ghc-base.git] / Data / Array.hs

diff --git a/Data/Array.hs b/Data/Array.hs
index 499f791..d9083da 100644 (file)
--- a/Data/Array.hs
+++ b/Data/Array.hs
@@ -44,10 +44,13 @@ module  Data.Array
 
     ) where
 
+#ifndef __NHC__
 import Data.Dynamic
+#endif
 
-#ifdef __GLASGOW_HASKELL__
 import Data.Ix
+
+#ifdef __GLASGOW_HASKELL__
 import GHC.Arr         -- Most of the hard work is done here
 import GHC.Err         ( undefined )
 #endif
@@ -56,5 +59,11 @@ import GHC.Err               ( undefined )
 import Hugs.Array
 #endif
 
-#include "Dynamic.h"
+#ifdef __NHC__
+import Array           -- Haskell'98 arrays
+#endif
+
+#ifndef __NHC__
+#include "Typeable.h"
 INSTANCE_TYPEABLE2(Array,arrayTc,"Array")
+#endif