diff options
author | charliesome <charliesome@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-09 10:18:56 +0000 |
---|---|---|
committer | charliesome <charliesome@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-09 10:18:56 +0000 |
commit | ecab6908621da9202e7e9c9caccc8424f525be26 (patch) | |
tree | 0e38b89fc3bd2813e302de18f326f5edf7337992 | |
parent | a39e724dfe64a7f50d9e024b73bfcad16ded2322 (diff) | |
download | ruby-ecab6908621da9202e7e9c9caccc8424f525be26.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/io/console/console.c | 17 |
2 files changed, 6 insertions, 17 deletions
@@ -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> * NEWS: update about new methods for Binding. diff --git a/ext/io/console/console.c b/ext/io/console/console.c index 2a83f17135..f3379ffd8d 100644 --- a/ext/io/console/console.c +++ b/ext/io/console/console.c @@ -668,23 +668,6 @@ console_ioflush(VALUE 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: * IO.console -> #<File:/dev/tty> |