* ext/io/console/console.c: delete redefinition of rb_cloexec_open.
This function is always defined by io.c and is declared as non-static in a header file, so this declaration causes a compilation error. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
a39e724dfe
commit
ecab690862
@ -1,3 +1,9 @@
|
|||||||
|
Fri Aug 9 07:16:00 2013 Charlie Somerville <charliesome@ruby-lang.org>
|
||||||
|
|
||||||
|
* ext/io/console/console.c: delete redefinition of rb_cloexec_open.
|
||||||
|
This function is always defined by io.c and is declared as non-static
|
||||||
|
in a header file, so this declaration causes a compilation error.
|
||||||
|
|
||||||
Fri Aug 9 19:13:54 2013 Koichi Sasada <ko1@atdot.net>
|
Fri Aug 9 19:13:54 2013 Koichi Sasada <ko1@atdot.net>
|
||||||
|
|
||||||
* NEWS: update about new methods for Binding.
|
* NEWS: update about new methods for Binding.
|
||||||
|
@ -668,23 +668,6 @@ console_ioflush(VALUE io)
|
|||||||
return io;
|
return io;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef HAVE_RB_CLOEXEC_OPEN
|
|
||||||
static int
|
|
||||||
rb_cloexec_open(const char *pathname, int flags, mode_t mode)
|
|
||||||
{
|
|
||||||
int ret;
|
|
||||||
#ifdef O_CLOEXEC
|
|
||||||
/* O_CLOEXEC is available since Linux 2.6.23. Linux 2.6.18 silently ignore it. */
|
|
||||||
flags |= O_CLOEXEC;
|
|
||||||
#elif defined O_NOINHERIT
|
|
||||||
flags |= O_NOINHERIT;
|
|
||||||
#endif
|
|
||||||
return open(pathname, flags, mode);
|
|
||||||
}
|
|
||||||
|
|
||||||
#define rb_update_max_fd(fd) (void)(fd)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* call-seq:
|
* call-seq:
|
||||||
* IO.console -> #<File:/dev/tty>
|
* IO.console -> #<File:/dev/tty>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user