зеркало из https://github.com/github/ruby.git
* io.c (io_cntl): change 'cmd' type to int. ioctl and fcntl need to
be passed int. * io.c (rb_io_ctl): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
62374161f1
Коммит
ff07709777
|
@ -1,3 +1,9 @@
|
|||
Fri Mar 4 22:01:14 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
||||
|
||||
* io.c (io_cntl): change 'cmd' type to int. ioctl and fcntl need to
|
||||
be passed int.
|
||||
* io.c (rb_io_ctl): ditto.
|
||||
|
||||
Fri Mar 4 21:10:40 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
|
||||
|
||||
* configure.in: save warnflags. the patch is created by Eric Wong.
|
||||
|
|
6
io.c
6
io.c
|
@ -7650,7 +7650,7 @@ rb_f_select(int argc, VALUE *argv, VALUE obj)
|
|||
}
|
||||
|
||||
static int
|
||||
io_cntl(int fd, unsigned long cmd, long narg, int io_p)
|
||||
io_cntl(int fd, int cmd, long narg, int io_p)
|
||||
{
|
||||
int retval;
|
||||
|
||||
|
@ -7658,7 +7658,7 @@ io_cntl(int fd, unsigned long cmd, long narg, int io_p)
|
|||
# if defined(__CYGWIN__)
|
||||
retval = io_p?ioctl(fd, cmd, (void*)narg):fcntl(fd, cmd, narg);
|
||||
# else
|
||||
retval = io_p?ioctl(fd, cmd, narg):fcntl(fd, (int)cmd, narg);
|
||||
retval = io_p?ioctl(fd, cmd, narg):fcntl(fd, cmd, narg);
|
||||
# endif
|
||||
# if defined(F_DUPFD)
|
||||
if (!io_p && retval != -1 && cmd == F_DUPFD) {
|
||||
|
@ -7677,7 +7677,7 @@ io_cntl(int fd, unsigned long cmd, long narg, int io_p)
|
|||
static VALUE
|
||||
rb_io_ctl(VALUE io, VALUE req, VALUE arg, int io_p)
|
||||
{
|
||||
unsigned long cmd = NUM2ULONG(req);
|
||||
int cmd = NUM2INT(req);
|
||||
rb_io_t *fptr;
|
||||
long len = 0;
|
||||
long narg = 0;
|
||||
|
|
Загрузка…
Ссылка в новой задаче