summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-20 09:53:14 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-20 09:53:14 +0000
commitbf598cb6645f8e568c1485f81043d00860539193 (patch)
tree5c695988ca7301544f7558c0dd5b741b1e25a2b6
parentf8dce924105d7b3ccd55ef6866eca31946f6a69a (diff)
merges r21662 from trunk into ruby_1_9_1.
* thread.c (rb_thread_execute_interrupts): needs rb_signal_buff_size to be declared. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread.c1
-rw-r--r--thread_pthread.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e707de393d..a8cae5371d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 19 14:31:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread.c (rb_thread_execute_interrupts): needs
+ rb_signal_buff_size to be declared.
+
Mon Jan 19 13:34:25 2009 Koichi Sasada <ko1@atdot.net>
* ruby.c (require_libraries): reset th->parse_in_eval while
diff --git a/thread.c b/thread.c
index 7acf191ffb..3eb304d007 100644
--- a/thread.c
+++ b/thread.c
@@ -69,6 +69,7 @@ static int rb_thread_dead(rb_thread_t *th);
static void rb_check_deadlock(rb_vm_t *vm);
+int rb_signal_buff_size(void);
void rb_signal_exec(rb_thread_t *th, int sig);
void rb_disable_interrupt(void);
void rb_thread_stop_timer_thread(void);
diff --git a/thread_pthread.c b/thread_pthread.c
index 72f8a2f288..3e368c6a6b 100644
--- a/thread_pthread.c
+++ b/thread_pthread.c
@@ -741,8 +741,6 @@ get_ts(struct timespec *ts, unsigned long nsec)
return ts;
}
-int rb_signal_buff_size(void);
-
static void *
thread_timer(void *dummy)
{