From 2d868906714909eac78347d90c8d638fbed22702 Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 25 May 2014 11:00:26 +0000 Subject: [PATCH] signal.c: revert part of r46100 * signal.c (check_stack_overflow): revert part of r46100, the previous condition was correct, and fix compilation error on other architecture linux. [ruby-core:62746] [Bug #9862] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46113 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ signal.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e1b873e83d..3b73defa02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun May 25 20:00:23 2014 Nobuyoshi Nakada + + * signal.c (check_stack_overflow): revert part of r46100, the + previous condition was correct, and fix compilation error on + other architecture linux. [ruby-core:62746] [Bug #9862] + Sun May 25 17:09:13 2014 Tanaka Akira * test/lib/minitest/unit.rb: Less ObjectSpace.each_object(Tempfile) diff --git a/signal.c b/signal.c index 5af01fe087..675076094f 100644 --- a/signal.c +++ b/signal.c @@ -702,7 +702,7 @@ rb_get_next_signal(void) #if defined(USE_SIGALTSTACK) || defined(_WIN32) NORETURN(void ruby_thread_stack_overflow(rb_thread_t *th)); -#if (defined(HAVE_UCONTEXT_H) && (defined __i386__ || defined __x86_64__)) +#if !(defined(HAVE_UCONTEXT_H) && (defined __i386__ || defined __x86_64__)) #elif defined __linux__ # define USE_UCONTEXT_REG 1 #elif defined __APPLE__