diff options
-rw-r--r-- | file.c | 9 |
1 files changed, 0 insertions, 9 deletions
@@ -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) { |