summaryrefslogtreecommitdiffstats
path: root/yarvcore.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-03 09:09:14 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-05-03 09:09:14 +0000
commite19833200a7c07ea32a968fc9528a15a39adb079 (patch)
treee8e9193e10bf81d22c9893cb8e47951fa4483e99 /yarvcore.c
parent3230c651031b5eaa1a4fb6d9c5ed3c6584745aa6 (diff)
downloadruby-e19833200a7c07ea32a968fc9528a15a39adb079.tar.gz
ruby-e19833200a7c07ea32a968fc9528a15a39adb079.tar.xz
ruby-e19833200a7c07ea32a968fc9528a15a39adb079.zip
* vm_evalbody.ci, insns.def, vm.c, tool/insns2vm.rb (rb_num_t):
renamed to get rid of name clash. [ruby-dev:30504] * yarvcore.c (ruby_thread_init): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'yarvcore.c')
-rw-r--r--yarvcore.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/yarvcore.c b/yarvcore.c
index 883ae8252..47d1a4133 100644
--- a/yarvcore.c
+++ b/yarvcore.c
@@ -359,7 +359,7 @@ th_init(rb_thread_t *th)
extern VALUE ruby_top_self;
static VALUE
-thread_init(VALUE self)
+ruby_thread_init(VALUE self)
{
rb_thread_t *th;
rb_vm_t *vm = GET_THREAD()->vm;
@@ -378,7 +378,7 @@ VALUE
rb_thread_alloc(VALUE klass)
{
VALUE self = thread_alloc(klass);
- thread_init(self);
+ ruby_thread_init(self);
return self;
}
@@ -463,7 +463,7 @@ Init_VM(void)
/* ::Thread */
rb_cThread = rb_define_class("Thread", rb_cObject);
rb_undef_alloc_func(rb_cThread);
- rb_define_method(rb_cThread, "initialize", thread_init, 0);
+ rb_define_method(rb_cThread, "initialize", ruby_thread_init, 0);
/* ::VM::USAGE_ANALISYS_* */
rb_define_const(rb_cVM, "USAGE_ANALISYS_INSN", rb_hash_new());