зеркало из https://github.com/github/ruby.git
* io.c: supress warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32159 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
afd7e4668f
Коммит
8192693ccf
|
@ -1,3 +1,7 @@
|
|||
Sat Jun 18 11:09:03 2011 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* io.c: supress warnings.
|
||||
|
||||
Sat Jun 18 10:22:39 2011 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* internal.h: declare more internal functions.
|
||||
|
|
6
io.c
6
io.c
|
@ -7470,7 +7470,8 @@ do_io_advise(rb_io_t *fptr, VALUE advice, off_t offset, off_t len)
|
|||
ias.offset = offset;
|
||||
ias.len = len;
|
||||
|
||||
if (rv = (int)rb_thread_io_blocking_region(io_advise_internal, &ias, fptr->fd))
|
||||
rv = (int)rb_thread_io_blocking_region(io_advise_internal, &ias, fptr->fd);
|
||||
if (rv)
|
||||
/* posix_fadvise(2) doesn't set errno. On success it returns 0; otherwise
|
||||
it returns the error code. */
|
||||
rb_syserr_fail(rv, RSTRING_PTR(fptr->pathv));
|
||||
|
@ -8539,11 +8540,12 @@ maygvl_copy_stream_continue_p(int has_gvl, struct copy_stream_struct *stp)
|
|||
#if defined(ERESTART)
|
||||
case ERESTART:
|
||||
#endif
|
||||
if (rb_thread_interrupted(stp->th))
|
||||
if (rb_thread_interrupted(stp->th)) {
|
||||
if (has_gvl)
|
||||
rb_thread_execute_interrupts(stp->th);
|
||||
else
|
||||
rb_thread_call_with_gvl(exec_interrupts, (void *)stp->th);
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
|
|
Загрузка…
Ссылка в новой задаче