[project @ 1996-06-26 10:26:00 by partain]

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

diff --git a/ghc/compiler/utils/Argv.lhs b/ghc/compiler/utils/Argv.lhs
index 58926a8..821a806 100644 (file)
--- a/ghc/compiler/utils/Argv.lhs
+++ b/ghc/compiler/utils/Argv.lhs
@@ -12,10 +12,18 @@ import PreludeGlaST ( indexAddrOffAddr )
 
 CHK_Ubiq() -- debugging consistency check
 
+#if __GLASGOW_HASKELL__ >= 200
+# define ADDR      GHCbase.Addr
+# define PACK_STR   packCString
+#else
+# define ADDR      _Addr
+# define PACK_STR   _packCString
+#endif
+
 argv :: [FAST_STRING]
 argv = unpackArgv ``prog_argv'' (``prog_argc''::Int)
 
-unpackArgv :: _Addr -> Int -> [FAST_STRING] -- argv[1 .. argc-1]
+unpackArgv :: ADDR -> Int -> [FAST_STRING] -- argv[1 .. argc-1]
 
 unpackArgv argv argc = unpack 1
   where
@@ -24,6 +32,6 @@ unpackArgv argv argc = unpack 1
       = if (n >= argc)
        then ([] :: [FAST_STRING])
        else case (indexAddrOffAddr argv n) of { item ->
-            _packCString item : unpack (n + 1)
+            PACK_STR item : unpack (n + 1)
             }
 \end{code}