aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--thread_win32.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6ed9a02b1c..1408418e45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jun 28 13:41:51 2011 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * thread_win32.c (native_stop_timer_thread): fixed commit miss of
+ r32244. grep sources before changing the signature of a function.
+
Tue Jun 28 11:49:14 2011 Koichi Sasada <ko1@atdot.net>
* thread_pthread.c (consume_communication_pipe):
diff --git a/thread_win32.c b/thread_win32.c
index 5c20650cae..68fb3467b8 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -745,7 +745,7 @@ rb_thread_create_timer_thread(void)
}
static int
-native_stop_timer_thread(void)
+native_stop_timer_thread(int close_anyway)
{
int stopped = --system_working <= 0;
if (stopped) {