summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsof <unknown>1998-08-18 13:45:20 +0000
committersof <unknown>1998-08-18 13:45:20 +0000
commit7da0b20f0616f4953b9404485a73e159f05f959f (patch)
tree95eb68088631cbbbdc75aea7d2aeac84e71709dd
parentb013eb356b0af840580638275cef67ddf682d844 (diff)
downloadhaskell-7da0b20f0616f4953b9404485a73e159f05f959f.tar.gz
[project @ 1998-08-18 13:45:20 by sof]
Some more 3.03 ForeignObj adjustments
-rw-r--r--ghc/compiler/utils/FastString.lhs9
1 files changed, 8 insertions, 1 deletions
diff --git a/ghc/compiler/utils/FastString.lhs b/ghc/compiler/utils/FastString.lhs
index f49002ab3a..2142e8e3d0 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