From: simonmar Date: Fri, 21 Sep 2001 11:55:56 +0000 (+0000) Subject: [project @ 2001-09-21 11:55:56 by simonmar] X-Git-Tag: Approximately_9120_patches~944 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=50ec01289b7efdbd7b091066cf367fe14e50200b;p=ghc-hetmet.git [project @ 2001-09-21 11:55:56 by simonmar] Fix type of foreign import of getProgArgv: the first arg should be Ptr CInt, not Ptr Int. Fixes a bug on Alpha (not the bug I was looking for, unfortunately). MERGE TO STABLE. --- diff --git a/ghc/lib/std/System.lhs b/ghc/lib/std/System.lhs index 6a45d16..c5b6206 100644 --- a/ghc/lib/std/System.lhs +++ b/ghc/lib/std/System.lhs @@ -1,5 +1,5 @@ -- ----------------------------------------------------------------------------- --- $Id: System.lhs,v 1.33 2001/08/14 17:14:22 sof Exp $ +-- $Id: System.lhs,v 1.34 2001/09/21 11:55:56 simonmar Exp $ -- -- (c) The University of Glasgow, 1994-2000 -- @@ -44,7 +44,7 @@ getArgs = peekArray (p - 1) (advancePtr argv 1) >>= mapM peekCString -foreign import "getProgArgv" getProgArgv :: Ptr Int -> Ptr (Ptr CString) -> IO () +foreign import "getProgArgv" getProgArgv :: Ptr CInt -> Ptr (Ptr CString) -> IO () -- Computation `getProgName' returns the name of the program -- as it was invoked.