diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-19 16:44:08 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-19 16:44:08 +0000 |
commit | a6eb4609c215fb04b9b5a40bd065826c7b6f1954 (patch) | |
tree | ab654037f6d6fe9b4c3a802fc66a939af6b9577e | |
parent | 75ee37707e1c8cc8431b102b80098a1d7679f8dd (diff) | |
download | ruby-a6eb4609c215fb04b9b5a40bd065826c7b6f1954.tar.gz |
* 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
-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) { |