[project @ 1997-09-03 23:51:06 by sof]

[ghc-hetmet.git] / ghc / compiler / utils / Argv.lhs

diff --git a/ghc/compiler/utils/Argv.lhs b/ghc/compiler/utils/Argv.lhs
index 821a806..c9fc6a5 100644 (file)
--- a/ghc/compiler/utils/Argv.lhs
+++ b/ghc/compiler/utils/Argv.lhs
@@ -8,16 +8,26 @@
 
 module Argv ( argv ) where
 
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 200
 import PreludeGlaST    ( indexAddrOffAddr )
+#endif
 
 CHK_Ubiq() -- debugging consistency check
+IMP_FASTSTRING()
 
-#if __GLASGOW_HASKELL__ >= 200
+#if __GLASGOW_HASKELL__ == 201
 # define ADDR      GHCbase.Addr
 # define PACK_STR   packCString
+#elif __GLASGOW_HASKELL__ >= 202
+# define ADDR      GlaExts.Addr
+# define PACK_STR   mkFastCharString
 #else
 # define ADDR      _Addr
+# define PACK_STR   mkFastCharString
+/*
+# define ADDR      _Addr
 # define PACK_STR   _packCString
+*/
 #endif
 
 argv :: [FAST_STRING]