kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* file.c (rb_thread_flock): should have resolved conflict.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2005-09-19 16:44:08 +00:00
parent 75ee37707e
commit a6eb4609c2
1 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
file.c
View file

@ -2886,20 +2886,11 @@ static int
rb_thread_flock(int fd, int op, OpenFile *fptr) rb_thread_flock(int fd, int op, OpenFile *fptr)
{ {
if (rb_thread_alone() || (op & LOCK_NB)) { if (rb_thread_alone() || (op & LOCK_NB)) {
<<<<<<< file.c
int n;
TRAP_BEG;
n = flock(fd, op);
TRAP_END;
return n;
=======
int ret; int ret;
TRAP_BEG; TRAP_BEG;
ret = flock(fd, op); ret = flock(fd, op);
TRAP_END; TRAP_END;
return ret; return ret;
>>>>>>> 1.208
} }
op |= LOCK_NB; op |= LOCK_NB;
while (flock(fd, op) < 0) { while (flock(fd, op) < 0) {