1 files changed, 16 insertions, 17 deletions

diff --git a/yarv.h b/yarv.h
index 9d21bfc469..9fb8722666 100644
--- a/yarv.h
+++ b/yarv.h
@@ -34,10 +34,10 @@ RUBY_EXTERN int yarvIsWorking;
 #endif
 
 
-#if YARV_THREAD_MODEL == 2
+#if RUBY_VM_THREAD_MODEL == 2
 
-extern yarv_thread_t *yarvCurrentThread;
-extern yarv_vm_t *theYarvVM;
+extern rb_thead_t *yarvCurrentThread;
+extern rb_vm_t *theYarvVM;
 
 static inline VALUE
 yarv_get_current_running_thread_value(void)
@@ -45,7 +45,7 @@ yarv_get_current_running_thread_value(void)
     return yarvCurrentThread->self;
 }
 
-static inline yarv_thread_t *
+static inline rb_thead_t *
 yarv_get_current_running_thread(void)
 {
     return yarvCurrentThread;
@@ -55,15 +55,15 @@ yarv_get_current_running_thread(void)
 #define GET_THREAD() yarvCurrentThread
 
 static inline void
-yarv_set_current_running_thread_raw(yarv_thread_t *th)
+rb_thread_set_current_raw(rb_thead_t *th)
 {
     yarvCurrentThread = th;
 }
 
 static inline void
-yarv_set_current_running_thread(yarv_thread_t *th)
+rb_thread_set_current(rb_thead_t *th)
 {
-    yarv_set_current_running_thread_raw(th);
+    rb_thread_set_current_raw(th);
     th->vm->running_thread = th;
 }
 
@@ -73,33 +73,32 @@ yarv_set_current_running_thread(yarv_thread_t *th)
 
 void rb_vm_change_state();
 
-VALUE th_invoke_yield(yarv_thread_t *th, int argc, VALUE *argv);
+VALUE th_invoke_yield(rb_thead_t *th, int argc, VALUE *argv);
 
-VALUE th_call0(yarv_thread_t *th, VALUE klass, VALUE recv,
+VALUE th_call0(rb_thead_t *th, VALUE klass, VALUE recv,
 	       VALUE id, ID oid, int argc, const VALUE *argv,
 	       NODE * body, int nosuper);
 
 VALUE *yarv_svar(int);
 
-VALUE th_call_super(yarv_thread_t *th, int argc, const VALUE *argv);
+VALUE th_call_super(rb_thead_t *th, int argc, const VALUE *argv);
 
 VALUE yarv_backtrace(int lev);
 
 VALUE yarvcore_eval_parsed(NODE *node, VALUE file);
 
-VALUE th_invoke_proc(yarv_thread_t *th, yarv_proc_t *proc,
+VALUE th_invoke_proc(rb_thead_t *th, rb_proc_t *proc,
 		     VALUE self, int argc, VALUE *argv);
-VALUE th_make_proc(yarv_thread_t *th, yarv_control_frame_t *cfp,
-		   yarv_block_t *block);
-VALUE th_make_env_object(yarv_thread_t *th, yarv_control_frame_t *cfp);
+VALUE th_make_proc(rb_thead_t *th, rb_control_frame_t *cfp,
+		   rb_block_t *block);
+VALUE th_make_env_object(rb_thead_t *th, rb_control_frame_t *cfp);
 VALUE yarvcore_eval(VALUE self, VALUE str, VALUE file, VALUE line);
 
 int yarv_block_given_p(void);
 
 VALUE yarv_load(char *);
-VALUE yarv_obj_is_proc(VALUE);
-int th_get_sourceline(yarv_control_frame_t *);
-VALUE th_backtrace(yarv_thread_t *, int);
+int th_get_sourceline(rb_control_frame_t *);
+VALUE th_backtrace(rb_thead_t *, int);
 void yarv_bug(void);
 
 #endif