diff --git a/ChangeLog b/ChangeLog index 951694ad0a..271e46c0fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Dec 18 14:25:17 2014 NAKAMURA Usaku + + * signal.c (ruby_signal): since SIGKILL is not supported by MSVCRT, + should be treated before calling signal(2). + [Bug #10615] + Wed Dec 17 12:20:56 2014 Nobuyoshi Nakada * compile.c (rb_method_for_self_aref, rb_method_for_self_aset): diff --git a/signal.c b/signal.c index 67990856ea..c9e6ffd52e 100644 --- a/signal.c +++ b/signal.c @@ -634,6 +634,17 @@ posix_signal(int signum, sighandler_t handler) return ruby_signal(signum, handler); } +#elif defined _WIN32 +static inline sighandler_t +ruby_signal(int signum, sighandler_t handler) +{ + if (signum == SIGKILL) { + errno = EINVAL; + return SIG_ERR; + } + return signal(signum, handler); +} + #else /* !POSIX_SIGNAL */ #define ruby_signal(sig,handler) (/* rb_trap_accept_nativethreads[(sig)] = 0,*/ signal((sig),(handler))) #if 0 /* def HAVE_NATIVETHREAD */