* vm.h: rename insn_func_type to rb_insn_func_type.

* vm_evalbody.ci: ditt.
* insns.def: add opt_call_native_compiled instruction
  instead of opt_call_native_compiled.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 7 deletions

diff --git a/vm.h b/vm.h
index 072563e1f7..b1c543eb9c 100644
--- a/vm.h
+++ b/vm.h
@@ -24,6 +24,13 @@ typedef unsigned long lindex_t;
 typedef unsigned long dindex_t;
 typedef rb_num_t GENTRY;
 
+#ifndef FUNC_FASTCALL
+#define FUNC_FASTCALL(x) x
+#endif
+
+typedef rb_control_frame_t *
+  (FUNC_FASTCALL(*rb_insn_func_t))(rb_thread_t *, rb_control_frame_t *);
+
 extern VALUE rb_cEnv;
 extern VALUE ruby_vm_global_state_version;
 extern VALUE ruby_vm_redefined_flag;
@@ -101,13 +108,6 @@ error !
 #define ELABEL(x)
 #define LABEL_PTR(x) &LABEL(x)
 
-#ifndef FUNC_FASTCALL
-#define FUNC_FASTCALL(x) x
-#endif
-
-typedef rb_control_frame_t *
-  (FUNC_FASTCALL(*insn_func_type))(rb_thread_t *, rb_control_frame_t *);
-
 #define INSN_ENTRY(insn) \
   static rb_control_frame_t * \
     FUNC_FASTCALL(LABEL(insn))(rb_thread_t *th, rb_control_frame_t *reg_cfp) {