From 3923e587f34c7dc1318243bfdf505b0cb3cdbe50 Mon Sep 17 00:00:00 2001 From: yugui Date: Thu, 2 Dec 2010 08:06:00 +0000 Subject: merges r29413 from trunk into ruby_1_9_2. -- * vm_core.h: add missing prototypes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30030 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- version.h | 2 +- vm_core.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/version.h b/version.h index 751d72768a..0241ec6859 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 60 +#define RUBY_PATCHLEVEL 61 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 diff --git a/vm_core.h b/vm_core.h index 1843567693..2c73dd7e95 100644 --- a/vm_core.h +++ b/vm_core.h @@ -632,6 +632,9 @@ VALUE rb_vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, VALUE self, VALUE rb_vm_make_proc(rb_thread_t *th, const rb_block_t *block, VALUE klass); VALUE rb_vm_make_env_object(rb_thread_t *th, rb_control_frame_t *cfp); +void rb_thread_start_timer_thread(void); +void rb_thread_stop_timer_thread(void); +void rb_thread_reset_timer_thread(void); void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1); int ruby_thread_has_gvl_p(void); VALUE rb_make_backtrace(void); @@ -671,6 +674,7 @@ extern rb_vm_t *ruby_current_vm; #define RUBY_VM_SET_FINALIZER_INTERRUPT(th) ((th)->interrupt_flag |= 0x04) #define RUBY_VM_INTERRUPTED(th) ((th)->interrupt_flag & 0x02) +void rb_threadptr_check_signal(rb_thread_t *mth); void rb_threadptr_signal_raise(rb_thread_t *th, int sig); void rb_threadptr_signal_exit(rb_thread_t *th); void rb_threadptr_execute_interrupts(rb_thread_t *); -- cgit v1.2.3