зеркало из https://github.com/github/ruby.git
* io.c (nogvl_io_cntl): rb_cloexec_fcntl_dupfd's 2nd argument is int.
* process.c (move_fds_to_avoid_crash): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
cd3445ca6e
Коммит
f926980902
|
@ -1,3 +1,9 @@
|
|||
Tue Nov 1 14:55:29 2011 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* io.c (nogvl_io_cntl): rb_cloexec_fcntl_dupfd's 2nd argument is int.
|
||||
|
||||
* process.c (move_fds_to_avoid_crash): ditto.
|
||||
|
||||
Tue Nov 1 13:14:33 2011 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* vsnprintf.c (BSD_vfprintf): support 'll' prefix.
|
||||
|
|
2
io.c
2
io.c
|
@ -7842,7 +7842,7 @@ static VALUE nogvl_io_cntl(void *ptr)
|
|||
else
|
||||
#if defined(F_DUPFD)
|
||||
if (arg->cmd == F_DUPFD)
|
||||
return (VALUE)rb_cloexec_fcntl_dupfd(arg->fd, arg->narg);
|
||||
return (VALUE)rb_cloexec_fcntl_dupfd(arg->fd, (int)arg->narg);
|
||||
else
|
||||
#endif
|
||||
return (VALUE)fcntl(arg->fd, arg->cmd, arg->narg);
|
||||
|
|
|
@ -2499,7 +2499,7 @@ proc_syswait(VALUE pid)
|
|||
static int
|
||||
move_fds_to_avoid_crash(int *fdp, int n, VALUE fds)
|
||||
{
|
||||
long min = 0;
|
||||
int min = 0;
|
||||
int i;
|
||||
for (i = 0; i < n; i++) {
|
||||
int ret;
|
||||
|
|
Загрузка…
Ссылка в новой задаче