[commit: process] encoding: Merge branch 'encoding' of equinox.local:~/Programming/Checkouts/ghc.git/libraries/process into encoding (f3c8b91)

[Max Bolingbroke]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/process

On branch  : encoding

http://hackage.haskell.org/trac/ghc/changeset/f3c8b91d2f4323b121815d6225c9d462c663d49f

>---------------------------------------------------------------

commit f3c8b91d2f4323b121815d6225c9d462c663d49f
Merge: a4d13cd... b4c2d52...
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date:   Tue Apr 5 11:58:28 2011 +0100

    Merge branch 'encoding' of equinox.local:~/Programming/Checkouts/ghc.git/libraries/process into encoding
    
    Conflicts:
    	System/Process/Internals.hs

 System/Process/Internals.hs |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

diff --cc System/Process/Internals.hs
index bcfa7d0,0098d3b..4de3a5c
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@@ -81,10 -81,10 +81,6 @@@ import GHC.IOBase	( haFD, FD, IOExcepti
  import GHC.Handle
  #endif
  
- #if MIN_VERSION_base(4,3,2) && !defined(mingw32_HOST_OS)
- import qualified GHC.Foreign as GHC
- #endif
- 
 -#if (__GLASGOW_HASKELL__ > 700) && !defined(mingw32_HOST_OS)
 -import qualified GHC.Foreign as GHC
 -#endif
 -
  # elif __HUGS__
  
  import Hugs.Exception	( IOException(..) )
@@@ -239,8 -232,8 +228,8 @@@ runGenProcess_ fun CreateProcess{ cmdsp
     alloca $ \ pfdStdOutput ->
     alloca $ \ pfdStdError  ->
     maybeWith withCEnvironment mb_env $ \pEnv ->
--   maybeWith withFilePathLike mb_cwd $ \pWorkDir ->
--   withMany withFilePathLike (cmd:args) $ \cstrs ->
++   maybeWith withFilePath mb_cwd $ \pWorkDir ->
++   withMany withFilePath (cmd:args) $ \cstrs ->
     withArray0 nullPtr cstrs $ \pargs -> do
       
       fdin  <- mbFd fun fd_stdin  mb_stdin