From: sof <unknown>
Date: Sun, 18 May 1997 04:59:38 +0000 (+0000)
Subject: [project @ 1997-05-18 04:59:38 by sof]
X-Git-Tag: Approximately_1000_patches_recorded~642
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=f51b31dcdf3c9fa71beb69bf0802494fc915e018;p=ghc-hetmet.git

[project @ 1997-05-18 04:59:38 by sof]
Made 2.0x bootable
---

diff --git a/ghc/compiler/utils/Argv.lhs b/ghc/compiler/utils/Argv.lhs
index c9ba42b..478dcb1 100644
--- a/ghc/compiler/utils/Argv.lhs
+++ b/ghc/compiler/utils/Argv.lhs
@@ -8,13 +8,18 @@
 
 module Argv ( argv ) where
 
+#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 200
 import PreludeGlaST	( indexAddrOffAddr )
+#endif
 
 CHK_Ubiq() -- debugging consistency check
 
-#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