ko1	2008-10-22 05:59:23 +0900 (Wed, 22 Oct 2008)

  New Revision: 19882

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19882

  Log:
    * include/ruby/vm.h: write a comment.
    * common.mk: remove vm.h from any rules.
      vm.h is not needed on this version.
    * vm_core.h: ditto.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/include/ruby/vm.h
    trunk/vm_core.h

Index: include/ruby/vm.h
===================================================================
--- include/ruby/vm.h	(revision 19881)
+++ include/ruby/vm.h	(revision 19882)
@@ -9,9 +9,14 @@
 
 **********************************************************************/
 
-#ifndef RUBY_MVM_H
-#define RUBY_MVM_H 1
+#ifndef RUBY_VM_H
+#define RUBY_VM_H 1
 
-typedef struct rb_vm_struct rb_vm_t;
+/* Place holder.
+ *
+ * We will prepare VM creation/control APIs on 1.9.2 or later.
+ * If you have an interest about it, please see mvm branch.
+ * http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/
+ */
 
-#endif /* RUBY_MVM_H */
+#endif /* RUBY_VM_H */
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19881)
+++ ChangeLog	(revision 19882)
@@ -1,3 +1,12 @@
+Wed Oct 22 05:46:25 2008  Koichi Sasada  <ko1@a...>
+
+	* include/ruby/vm.h: write a comment.
+
+	* common.mk: remove vm.h from any rules.
+	  vm.h is not needed on this version.
+
+	* vm_core.h: ditto.
+
 Wed Oct 22 05:39:39 2008  Koichi Sasada  <ko1@a...>
 
 	* parse.y (arg_concat_gen): concat target node should be NODE_ARRAY.
Index: vm_core.h
===================================================================
--- vm_core.h	(revision 19881)
+++ vm_core.h	(revision 19882)
@@ -15,7 +15,6 @@
 #define RUBY_VM_THREAD_MODEL 2
 
 #include "ruby/ruby.h"
-#include "ruby/vm.h"
 #include "ruby/st.h"
 
 #include "node.h"
@@ -225,8 +224,7 @@
 #define GetVMPtr(obj, ptr) \
   GetCoreDataFromValue(obj, rb_vm_t, ptr)
 
-struct rb_vm_struct
-{
+typedef struct rb_vm_struct {
     VALUE self;
 
     rb_thread_lock_t global_vm_lock;
@@ -270,7 +268,7 @@
 #if defined(ENABLE_VM_OBJSPACE) && ENABLE_VM_OBJSPACE
     struct rb_objspace *objspace;
 #endif
-};
+} rb_vm_t;
 
 typedef struct {
     VALUE *pc;			/* cfp[0] */
Index: common.mk
===================================================================
--- common.mk	(revision 19881)
+++ common.mk	(revision 19882)
@@ -444,7 +444,7 @@
 ENCODING_H_INCLUDES= {$(VPATH)}encoding.h {$(VPATH)}oniguruma.h
 ID_H_INCLUDES      = {$(VPATH)}id.h
 VM_CORE_H_INCLUDES = {$(VPATH)}vm_core.h {$(VPATH)}vm_opts.h \
-	             {$(VPATH)}vm.h {$(VPATH)}thread_$(THREAD_MODEL).h \
+	             {$(VPATH)}thread_$(THREAD_MODEL).h \
 		     {$(VPATH)}node.h $(ID_H_INCLUDES)
 
 array.$(OBJEXT): {$(VPATH)}array.c $(RUBY_H_INCLUDES) {$(VPATH)}util.h

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/