ruby-changes:18009
From: yugui <ko1@a...>
Date: Thu, 2 Dec 2010 17:06:16 +0900 (JST)
Subject: [ruby-changes:18009] Ruby:r30030 (ruby_1_9_2): merges r29413 from trunk into ruby_1_9_2.
yugui 2010-12-02 17:06:00 +0900 (Thu, 02 Dec 2010) New Revision: 30030 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30030 Log: merges r29413 from trunk into ruby_1_9_2. -- * vm_core.h: add missing prototypes. Modified files: branches/ruby_1_9_2/version.h branches/ruby_1_9_2/vm_core.h Index: ruby_1_9_2/vm_core.h =================================================================== --- ruby_1_9_2/vm_core.h (revision 30029) +++ ruby_1_9_2/vm_core.h (revision 30030) @@ -632,6 +632,9 @@ 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 @@ #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 *); Index: ruby_1_9_2/version.h =================================================================== --- ruby_1_9_2/version.h (revision 30029) +++ ruby_1_9_2/version.h (revision 30030) @@ -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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/