diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-11 02:12:00 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-11 02:12:00 +0000 |
commit | 1a14a7a1d78092161cd296d0aa14b7a17ce46edd (patch) | |
tree | a5b661a918293e227a3cbbafe57c6acea174538b | |
parent | 69ac654c90178dce12c3365afbc03447a0fccf78 (diff) |
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
-rw-r--r-- | io.c | 3 | ||||
-rw-r--r-- | signal.c | 8 |
2 files changed, 9 insertions, 2 deletions
@@ -204,6 +204,9 @@ rb_update_max_fd(int fd) } } +#undef HAVE_FCNTL +#undef O_CLOEXEC + void rb_maygvl_fd_fix_cloexec(int fd) { @@ -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 |