From 4e73323a6007d0a554b52440f316e3c4c71eae26 Mon Sep 17 00:00:00 2001 From: kosaki Date: Mon, 5 Nov 2012 16:43:32 +0000 Subject: * thread_pthread.c (rb_reserved_fd_p): fix typo in macro check that prevented the ifdef ever being true. [Bug #7281] [ruby-core:48940] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ thread_pthread.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ea3d75a645..1fe01d0aeb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Nov 5 11:40:00 2012 Mark Somerville + + * thread_pthread.c (rb_reserved_fd_p): fix typo in macro check + that prevented the ifdef ever being true. + [Bug #7281] [ruby-core:48940] + Mon Nov 5 23:28:57 2012 Hiroshi Shirosaki * file.c (rb_get_path_check_to_string): extract from diff --git a/thread_pthread.c b/thread_pthread.c index 49686afbed..d60cb41e28 100644 --- a/thread_pthread.c +++ b/thread_pthread.c @@ -1448,7 +1448,7 @@ ruby_stack_overflowed_p(const rb_thread_t *th, const void *addr) int rb_reserved_fd_p(int fd) { -#ifdef USE_SLEEPY_TIMER_THRAED +#ifdef USE_SLEEPY_TIMER_THREAD if (fd == timer_thread_pipe[0] || fd == timer_thread_pipe[1]) { return 1; -- cgit v1.2.3