Repository : ssh://darcs.haskell.org//srv/darcs/packages/process On branch : master
http://hackage.haskell.org/trac/ghc/changeset/87555b51e7fc93bf8854eccad17eb2ed65592492 >--------------------------------------------------------------- commit 87555b51e7fc93bf8854eccad17eb2ed65592492 Author: Max Bolingbroke <[email protected]> Date: Fri Nov 18 17:48:29 2011 +0000 Update for a mutable localeEncoding >--------------------------------------------------------------- System/Process/Internals.hs | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs index c805ad0..087396e 100644 --- a/System/Process/Internals.hs +++ b/System/Process/Internals.hs @@ -417,8 +417,13 @@ pfdToHandle pfd mode = do False {-is_socket-} False {-non-blocking-} fD <- FD.setNonBlockingMode fD True -- see #3316 +#if __GLASGOW_HASKELL__ >= 703 + enc <- getLocaleEncoding +#else + let enc = localeEncoding +#endif mkHandleFromFD fD fd_type filepath mode False{-is_socket-} - (Just localeEncoding) + (Just enc) #else fdToHandle' fd (Just Stream) False{-Windows: not a socket, Unix: don't set non-blocking-} _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
