990212

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 2 deletions

diff --git a/file.c b/file.c
index 0296a46e88..92d9c76158 100644
--- a/file.c
+++ b/file.c
@@ -1302,8 +1302,9 @@ rb_file_truncate(obj, len)
 
 #if defined(USE_THREAD) && defined(EWOULDBLOCK)
 static int
-rb_thread_flock(fd, op)
+rb_thread_flock(fd, op, fptr)
     int fd, op;
+    OpenFile *fptr;
 {
     if (rb_thread_alone() || (op & LOCK_NB)) {
 	return flock(fd, op);
@@ -1314,6 +1315,7 @@ rb_thread_flock(fd, op)
 	  case EINTR:		/* can be happen? */
 	  case EWOULDBLOCK:
 	    rb_thread_schedule();	/* busy wait */
+	    rb_io_check_closed(fptr);
 	    break;
 	  default:
 	    return -1;
@@ -1321,7 +1323,7 @@ rb_thread_flock(fd, op)
     }
     return 0;
 }
-#define flock rb_thread_flock
+#define flock(fd, op) rb_thread_flock(fd, op, fptr)
 #endif
 
 static VALUE