From ecab6908621da9202e7e9c9caccc8424f525be26 Mon Sep 17 00:00:00 2001 From: charliesome Date: Fri, 9 Aug 2013 10:18:56 +0000 Subject: * 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 --- ChangeLog | 6 ++++++ ext/io/console/console.c | 17 ----------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index d7e1c7a0ec..31c0b047f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Aug 9 07:16:00 2013 Charlie Somerville + + * 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 * 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 -> # -- cgit v1.2.3