diff options
| author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-05 16:43:32 +0000 |
|---|---|---|
| committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-05 16:43:32 +0000 |
| commit | 4e73323a6007d0a554b52440f316e3c4c71eae26 (patch) | |
| tree | 131c77d9bcb028499c3757ef790c28d611ea98b3 | |
| parent | d33b9a8a724f5c46308b1a76062ac5722269905b (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | thread_pthread.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Mon Nov 5 11:40:00 2012 Mark Somerville <mark@scottishclmibs.com> + + * 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 <h.shirosaki@gmail.com> * 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; |