[commit: process] master: Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/process (f4af593)

[Max Bolingbroke]

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

On branch  : master

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

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

commit f4af593ceae56df5074dbdfde993fb25a3cf8e99
Merge: 87555b5... 8f7a6d2...
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date:   Sat Nov 19 11:18:57 2011 +0000

    Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/process
    
    Conflicts:
    	System/Process/Internals.hs

 System/Cmd.hs               |    2 +
 System/Process.hs           |  115 ++++++++++++++++---------------
 System/Process/Internals.hs |  159 +++++++++++++++++++++----------------------
 3 files changed, 139 insertions(+), 137 deletions(-)

diff --cc System/Process/Internals.hs
index 087396e,ac11c00..11de1f4
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@@ -417,17 -416,17 +416,17 @@@ pfdToHandle pfd mode = d
                         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 enc)
+   mkHandleFromFD fD fd_type filepath mode False {-is_socket-} (Just enc)
  #else
    fdToHandle' fd (Just Stream)
-      False{-Windows: not a socket,  Unix: don't set non-blocking-}
-      filepath mode True{-binary-}
+      False {-Windows: not a socket,  Unix: don't set non-blocking-}
+      filepath mode True {-binary-}
+ #endif
+ 
+ #if __GLASGOW_HASKELL__ < 703
+ getLocaleEncoding :: IO TextEncoding
 -getLocaleEncoding = return localEncoding
++getLocaleEncoding = return localeEncoding
  #endif
  
  #ifndef __HUGS__