From 1a14a7a1d78092161cd296d0aa14b7a17ce46edd Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 11 Oct 2014 02:12:00 +0000 Subject: [PATCH] Allow failure of sighandler installation on NativeClient. * signal.c (install_signalhandler, init_sigchld): allow failure because it always fails with ENOSYS on NaCl. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47873 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- io.c | 3 +++ signal.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/io.c b/io.c index 0be6b24a6f..4f98031c40 100644 --- a/io.c +++ b/io.c @@ -204,6 +204,9 @@ rb_update_max_fd(int fd) } } +#undef HAVE_FCNTL +#undef O_CLOEXEC + void rb_maygvl_fd_fix_cloexec(int fd) { diff --git a/signal.c b/signal.c index c42ce0aee0..d3c7cb8f32 100644 --- a/signal.c +++ b/signal.c @@ -1261,7 +1261,9 @@ install_sighandler(int signum, sighandler_t handler) rb_enable_interrupt(); return 0; } -#define install_sighandler(signum, handler) (install_sighandler(signum, handler) ? rb_bug(#signum) : (void)0) +#ifndef __native_client__ +# define install_sighandler(signum, handler) (install_sighandler(signum, handler) ? rb_bug(#signum) : (void)0) +#endif #if defined(SIGCLD) || defined(SIGCHLD) static int @@ -1281,7 +1283,9 @@ init_sigchld(int sig) rb_enable_interrupt(); return 0; } -#define init_sigchld(signum) (init_sigchld(signum) ? rb_bug(#signum) : (void)0) +# ifndef __native_client__ +# define init_sigchld(signum) (init_sigchld(signum) ? rb_bug(#signum) : (void)0) +# endif #endif void