X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Flib%2Fstd%2Fcbits%2FreadFile.c;h=c47b56cfd978921f39a2d882c5d623092776a49c;hb=6986b2b2439ce264df153878374f70cee54ef100;hp=7445b3ed0db22a3619a9b6324d397ea7b533b033;hpb=cadc82fc0a7a1e640bb04842769ca337dedb8c70;p=ghc-hetmet.git

diff --git a/ghc/lib/std/cbits/readFile.c b/ghc/lib/std/cbits/readFile.c
index 7445b3e..c47b56c 100644
--- a/ghc/lib/std/cbits/readFile.c
+++ b/ghc/lib/std/cbits/readFile.c
@@ -1,7 +1,7 @@
 /* 
  * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
  *
- * $Id: readFile.c,v 1.7 1999/07/12 10:43:13 sof Exp $
+ * $Id: readFile.c,v 1.8 1999/09/16 13:14:43 simonmar Exp $
  *
  * hGetContents Runtime Support
  */
@@ -77,9 +77,6 @@ StgForeignPtr ptr;
     fprintf(stderr, "rb: %d %d %d\n", fo->bufRPtr, fo->bufWPtr, fo->bufSize);
 #endif
 
-    if ( fo->flags & FILEOBJ_NONBLOCKING_IO && inputReady (ptr,0) != 1 )
-      return FILEOBJ_BLOCKED_READ;
-
     while ((count =
 	     (
 #ifdef USE_WINSOCK
@@ -170,9 +167,6 @@ StgInt len;
     p += count;
     total_count = count;
 
-    if ( fo->flags & FILEOBJ_NONBLOCKING_IO && inputReady (ptr,0) != 1 )
-      return FILEOBJ_BLOCKED_READ;
-
     while ((count =
              (
 #ifdef USE_WINSOCK
@@ -317,9 +311,6 @@ StgForeignPtr ptr;
     }
     fo->flags = (fo->flags & ~FILEOBJ_RW_WRITE) | FILEOBJ_RW_READ;
 
-    if ( fo->flags & FILEOBJ_NONBLOCKING_IO && inputReady (ptr,0) != 1 )
-      return FILEOBJ_BLOCKED_READ;
-
     while ( (count = 
 	       (
 #ifdef USE_WINSOCK