From: qrczak <unknown>
Date: Sat, 19 May 2001 08:02:37 +0000 (+0000)
Subject: [project @ 2001-05-19 08:02:37 by qrczak]
X-Git-Tag: Approximately_9120_patches~1925
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=ce39729dc87ecaf0fa440605dcd3d064350072e7;p=ghc-hetmet.git

[project @ 2001-05-19 08:02:37 by qrczak]
Implementation of locking in cbits is bogus. Disable it for now.
---

diff --git a/ghc/lib/std/PrelHandle.hsc b/ghc/lib/std/PrelHandle.hsc
index 353157a..6c516d7 100644
--- a/ghc/lib/std/PrelHandle.hsc
+++ b/ghc/lib/std/PrelHandle.hsc
@@ -4,7 +4,7 @@
 #undef DEBUG
 
 -- -----------------------------------------------------------------------------
--- $Id: PrelHandle.hsc,v 1.2 2001/05/18 21:57:30 qrczak Exp $
+-- $Id: PrelHandle.hsc,v 1.3 2001/05/19 08:02:37 qrczak Exp $
 --
 -- (c) The University of Glasgow, 1994-2001
 --
@@ -68,13 +68,15 @@ import PrelConc
 -- -----------------------------------------------------------------------------
 -- TODO:
 
--- hWaitForInput blocks (should use a timeout).
+-- hWaitForInput blocks (should use a timeout)
 
 -- unbuffered hGetLine is a bit dodgy
 
 -- hSetBuffering: can't change buffering on a stream, 
 --	when the read buffer is non-empty? (no way to flush the buffer)
 
+-- fix locking
+
 -- ---------------------------------------------------------------------------
 -- Creating a new handle
 
@@ -651,11 +653,21 @@ openFd fd filepath mode = do
 	   mkFileHandle fd filepath ha_type
 
 
-foreign import "lockFile" unsafe 
+{- TODO: Implementation of locking in cbits is bogus.
+   Disable it for now.
+
+foreign import "lockFile" unsafe
   lockFile :: CInt -> CInt -> CInt -> IO CInt
 
-foreign import "unlockFile" unsafe 
+foreign import "unlockFile" unsafe
   unlockFile :: CInt -> IO CInt
+-}
+
+lockFile :: CInt -> CInt -> CInt -> IO CInt
+lockFile _ _ _ = return 0
+
+unlockFile :: CInt -> IO CInt
+unlockFile _ = return 0
 
 
 mkFileHandle :: FD -> FilePath -> HandleType -> IO Handle