From a6eb4609c215fb04b9b5a40bd065826c7b6f1954 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 19 Sep 2005 16:44:08 +0000 Subject: [PATCH] * file.c (rb_thread_flock): should have resolved conflict. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- file.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/file.c b/file.c index d4a993be2a..f4eeb2974c 100644 --- a/file.c +++ b/file.c @@ -2886,20 +2886,11 @@ static int rb_thread_flock(int fd, int op, OpenFile *fptr) { if (rb_thread_alone() || (op & LOCK_NB)) { -<<<<<<< file.c - int n; - - TRAP_BEG; - n = flock(fd, op); - TRAP_END; - return n; -======= int ret; TRAP_BEG; ret = flock(fd, op); TRAP_END; return ret; ->>>>>>> 1.208 } op |= LOCK_NB; while (flock(fd, op) < 0) {