summaryrefslogtreecommitdiff
path: root/vm.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-05 13:34:34 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-05 13:34:34 +0000
commit51782c7f38f39f2146b5882d56df0cb8d1ec1847 (patch)
tree59217cf224f41515c87a6433776a985d01759abc /vm.c
parent7ac90158e284783159fefc37fa88fc2dc0bdd5a9 (diff)
merges r20535 from trunk into ruby_1_9_1.
* compile.c (ruby_iseq_compile, ruby_iseq_translate_threaded_code), (ruby_insns_name_array, ruby_iseq_build_from_ary): prefixed with ruby_. * iseq.c (ruby_iseq_load, ruby_insn_make_insn_table): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/vm.c b/vm.c
index 2bb050d19e..9fabe2dad7 100644
--- a/vm.c
+++ b/vm.c
@@ -1737,7 +1737,6 @@ m_core_set_postexe(VALUE self, VALUE iseqval)
return Qnil;
}
-VALUE insns_name_array(void);
extern VALUE *rb_gc_stack_start;
extern size_t rb_gc_stack_maxsize;
#ifdef __ia64
@@ -1845,7 +1844,7 @@ Init_VM(void)
#endif
/* ::VM::InsnNameArray */
- rb_define_const(rb_cRubyVM, "INSTRUCTION_NAMES", insns_name_array());
+ rb_define_const(rb_cRubyVM, "INSTRUCTION_NAMES", ruby_insns_name_array());
/* debug functions ::VM::SDR(), ::VM::NSDR() */
#if VMDEBUG