summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--thread_pthread.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e48e9b16f..5966324c6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 27 22:04:27 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * thread_pthread.c (consume_communication_pipe): change return
+ type to void. caller doesn't use it.
+
Mon Jun 27 21:29:50 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* thread_pthread.h (rb_global_vm_lock_struct): add volatile to
diff --git a/thread_pthread.c b/thread_pthread.c
index 2c5e31a4ce..cd1631261d 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -1018,7 +1018,7 @@ rb_thread_wakeup_timer_thread(void)
}
}
-static ssize_t
+static void
consume_communication_pipe(void)
{
const size_t buff_size = 1024;
@@ -1033,7 +1033,6 @@ consume_communication_pipe(void)
rb_bug_errno("consume_communication_pipe: read", errno);
}
}
- return result;
}
static void
@@ -1090,7 +1089,7 @@ thread_timer(void *p)
/* maybe timeout */
}
else if (result > 0) {
- (void)consume_communication_pipe();
+ consume_communication_pipe();
}
else { /* result < 0 */
if (errno == EINTR) {