From bbc12750a55a5c6ef4602e792ee73ad888e28a2e Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 5 Dec 2008 13:34:34 +0000
Subject: 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20554 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 vm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'vm.c')

diff --git a/vm.c b/vm.c
index 2bb050d19..9fabe2dad 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
-- 
cgit