summaryrefslogtreecommitdiffstats
path: root/vm_core.h
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-23 00:20:28 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-23 00:20:28 +0000
commita05cd1f55a80d3b159d986e24d67252d9a890d25 (patch)
treef7ab9657e81a7ea8b79696c2f0f1e0f9ca184d13 /vm_core.h
parentc1785306e1dd5b771126aa469594d54c6fdc55e9 (diff)
downloadruby-a05cd1f55a80d3b159d986e24d67252d9a890d25.tar.gz
ruby-a05cd1f55a80d3b159d986e24d67252d9a890d25.tar.xz
ruby-a05cd1f55a80d3b159d986e24d67252d9a890d25.zip
* common.mk: clean up
- remove blockinlining.$(OBJEXT) to built - make ENCODING_H_INCLDUES variable (include/ruby/encoding.h) - make VM_CORE_H_INCLUDES variable (vm_core.h) - simplify rules. - make depends rule to output depend status using gcc -MM. * include/ruby/mvm.h, include/ruby/vm.h: rename mvm.h to vm.h. * include/ruby.h: ditto. * load.c: add inclusion explicitly. * enumerator.c, object.c, parse.y, thread.c, vm_dump.c: remove useless inclusion. * eval_intern.h: cleanup inclusion. * vm_core.h: rb_thread_t should be defined in this file. * vm_evalbody.c, vm_exec.c: rename vm_evalbody.c to vm_exec.c. * vm.h, vm_exec.h: rename vm.h to vm_exec.h. * insnhelper.h, vm_insnhelper.h: rename insnhelper.h to vm_insnhelper.h. * vm.c, vm_insnhelper.c, vm_insnhelper.h: - rename vm_eval() to vm_exec_core(). - rename vm_eval_body() to vm_exec(). - cleanup include order. * vm_method.c: fix comment. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19466 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_core.h')
-rw-r--r--vm_core.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/vm_core.h b/vm_core.h
index 130f6c2b2..947628408 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -17,7 +17,7 @@
#include <setjmp.h>
#include "ruby/ruby.h"
-#include "ruby/mvm.h"
+#include "ruby/vm.h"
#include "ruby/st.h"
#include "ruby/node.h"
@@ -402,7 +402,7 @@ struct rb_unblock_callback {
struct rb_mutex_struct;
-struct rb_thread_struct
+typedef struct rb_thread_struct
{
VALUE self;
rb_vm_t *vm;
@@ -501,7 +501,7 @@ struct rb_thread_struct
/* misc */
int method_missing_reason;
int abort_on_exception;
-};
+} rb_thread_t;
/* iseq.c */
VALUE rb_iseq_new(NODE*, VALUE, VALUE, VALUE, VALUE);