From: simonmar <unknown>
Date: Tue, 31 Jul 2001 13:03:28 +0000 (+0000)
Subject: [project @ 2001-07-31 13:03:28 by simonmar]
X-Git-Tag: nhc98-1-18-release~1202
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=8943fbe83eef077406cd6eacc989917f86e823ea;p=haskell-directory.git

[project @ 2001-07-31 13:03:28 by simonmar]
merge ghc/lib/std/PrelHandle.hsc rev. 1.15
---

diff --git a/GHC/Handle.hsc b/GHC/Handle.hsc
index 7b39f6d..05b19b6 100644
--- a/GHC/Handle.hsc
+++ b/GHC/Handle.hsc
@@ -4,7 +4,7 @@
 #undef DEBUG
 
 -- -----------------------------------------------------------------------------
--- $Id: Handle.hsc,v 1.4 2001/07/31 12:48:55 simonmar Exp $
+-- $Id: Handle.hsc,v 1.5 2001/07/31 13:03:28 simonmar Exp $
 --
 -- (c) The University of Glasgow, 1994-2001
 --
@@ -1156,7 +1156,7 @@ hIsTerminalDevice handle = do
 -- hSetBinaryMode
 
 #ifdef _WIN32
-hSetBinaryMode handle bin = 
+hSetBinaryMode handle bin =
   withAllHandles__ "hSetBinaryMode" handle $ \ handle_ ->
     do let flg | bin       = (#const O_BINARY)
 	       | otherwise = (#const O_TEXT)
@@ -1166,10 +1166,9 @@ hSetBinaryMode handle bin =
 
 foreign import "setmode" setmode :: CInt -> CInt -> IO CInt
 #else
-hSetBinaryMode handle bin = do
+hSetBinaryMode handle bin =
   withAllHandles__ "hSetBinaryMode" handle $ \ handle_ ->
     return handle_{haIsBin=bin}
-  return ()
 #endif
 
 -- -----------------------------------------------------------------------------