summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--thread_pthread.c4
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b0238057d3..62f42e56dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+Mon Jun 27 11:41:47 2011 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * thread_pthread.c (rb_thread_create_timer_thread):
+ the type of retrun value of write(2) is ssize_t.
+
Mon Jun 27 09:57:02 2011 Koichi Sasada <ko1@atdot.net>
- * thread_pthread.c (rb_thread_create_timer_thread):
+ * 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>
diff --git a/thread_pthread.c b/thread_pthread.c
index be10a190cf..1ed021b826 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -993,7 +993,7 @@ static int timer_thread_pipe_owner_process;
void
rb_thread_wakeup_timer_thread(void)
{
- int result;
+ ssize_t result;
/* already opened */
if (timer_thread_pipe_owner_process == getpid()) {
@@ -1023,7 +1023,7 @@ consume_communication_pipe(void)
{
const size_t buff_size = 1024;
char buff[buff_size];
- int result;
+ ssize_t result;
retry:
result = read(timer_thread_pipe[0], buff, buff_size);
if (result < 0) {