summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-25 11:00:26 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-05-25 11:00:26 +0000
commit2d868906714909eac78347d90c8d638fbed22702 (patch)
tree89fba0a603c4ccce6d67ba36a25987718d348119
parent540ffb3abdce5916a13cd2918609cf8cbd9a0a03 (diff)
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
-rw-r--r--ChangeLog6
-rw-r--r--signal.c2
2 files changed, 7 insertions, 1 deletions
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 <nobu@ruby-lang.org>
+
+ * 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 <akr@fsij.org>
* 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__