From: sof <unknown>
Date: Tue, 18 Aug 1998 13:45:20 +0000 (+0000)
Subject: [project @ 1998-08-18 13:45:20 by sof]
X-Git-Tag: Approx_2487_patches~311
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=7da0b20f0616f4953b9404485a73e159f05f959f;p=ghc-hetmet.git

[project @ 1998-08-18 13:45:20 by sof]
Some more 3.03 ForeignObj adjustments
---

diff --git a/ghc/compiler/utils/FastString.lhs b/ghc/compiler/utils/FastString.lhs
index f49002a..2142e8e 100644
--- a/ghc/compiler/utils/FastString.lhs
+++ b/ghc/compiler/utils/FastString.lhs
@@ -48,7 +48,7 @@ module FastString
 #define COMPILING_FAST_STRING
 #include "HsVersions.h"
 
-#if __GLASGOW_HASKELL__ < 301
+#if 0 && __GLASGOW_HASKELL__ < 301
 import PackBase
 import STBase		( StateAndPtr#(..) )
 import IOHandle		( filePtr, readHandle, writeHandle )
@@ -78,7 +78,14 @@ import PrimPacked
 import GlaExts
 import Addr		( Addr(..) )
 import MutableArray	( MutableArray(..) )
+
+-- ForeignObj is now exported abstractly.
+#if __GLASGOW_HASKELL__ >= 303
+import qualified PrelForeign as Foreign  ( ForeignObj(..) )
+#else
 import Foreign		( ForeignObj(..) )
+#endif
+
 import IOExts		( IORef, newIORef, readIORef, writeIORef )
 import IO