summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-27 00:59:07 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-06-27 00:59:07 +0000
commitf18cf4f023448fc25078303c12d1cec15ed3edf9 (patch)
tree8bd5175b1a4fe3355103b3da43677c9f26a63478
parentd1d5d5e79845c292c6118884fa66729954daad01 (diff)
* thread_pthread.c (rb_thread_create_timer_thread):
Fixes missing initialization of oflags. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread_pthread.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c6016b6d3f..b0238057d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 27 09:57:02 2011 Koichi Sasada <ko1@atdot.net>
+
+ * thread_pthread.c (rb_thread_create_timer_thread):
+ Fixes missing initialization of oflags.
+
Mon Jun 27 09:07:42 2011 Koichi Sasada <ko1@atdot.net>
* thread_pthread.c: Stop polling in the timer thread when there are
diff --git a/thread_pthread.c b/thread_pthread.c
index f1137ec550..be10a190cf 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -1137,6 +1137,7 @@ rb_thread_create_timer_thread(void)
{
int oflags;
#if defined(O_NONBLOCK)
+ oflags = fcntl(timer_thread_pipe[1], F_GETFL);
oflags |= O_NONBLOCK;
fcntl(timer_thread_pipe[1], F_SETFL, oflags);
#endif /* defined(O_NONBLOCK) */