projects
/
ghc-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use explicit language extensions & remove extension fields from base.cabal
[ghc-base.git]
/
System
/
Environment.hs
diff --git
a/System/Environment.hs
b/System/Environment.hs
index
4b32987
..
2b6dec2
100644
(file)
--- a/
System/Environment.hs
+++ b/
System/Environment.hs
@@
-1,3
+1,5
@@
+{-# LANGUAGE CPP, ForeignFunctionInterface #-}
+
-----------------------------------------------------------------------------
-- |
-- Module : System.Environment
-----------------------------------------------------------------------------
-- |
-- Module : System.Environment
@@
-34,7
+36,8
@@
import Foreign
import Foreign.C
import Control.Exception.Base ( bracket )
import Control.Monad
import Foreign.C
import Control.Exception.Base ( bracket )
import Control.Monad
-import GHC.IOBase
+-- import GHC.IO
+import GHC.IO.Exception
#endif
#ifdef __HUGS__
#endif
#ifdef __HUGS__
@@
-123,7
+126,7
@@
getEnv name =
if litstring /= nullPtr
then peekCString litstring
else ioException (IOError Nothing NoSuchThing "getEnv"
if litstring /= nullPtr
then peekCString litstring
else ioException (IOError Nothing NoSuchThing "getEnv"
- "no environment variable" (Just name))
+ "no environment variable" Nothing (Just name))
foreign import ccall unsafe "getenv"
c_getenv :: CString -> IO (Ptr CChar)
foreign import ccall unsafe "getenv"
c_getenv :: CString -> IO (Ptr CChar)
@@
-154,7
+157,8
@@
withArgv new_args act = do
pName <- System.Environment.getProgName
existing_args <- System.Environment.getArgs
bracket (setArgs new_args)
pName <- System.Environment.getProgName
existing_args <- System.Environment.getArgs
bracket (setArgs new_args)
- (\argv -> do setArgs (pName:existing_args); freeArgv argv)
+ (\argv -> do _ <- setArgs (pName:existing_args)
+ freeArgv argv)
(const act)
freeArgv :: Ptr CString -> IO ()
(const act)
freeArgv :: Ptr CString -> IO ()