ko1	2008-09-03 10:19:31 +0900 (Wed, 03 Sep 2008)

  New Revision: 19075

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

  Log:
    * include/ruby/mvm.h, include/ruby/ruby.h, main.c:
      main.c doesn't need "ruby.h" any more.
    * thread_pthread.c, thread_win32.c (ruby_init_stack):
      change parameter type "VALUE *" to "void *".

  Modified files:
    branches/mvm/ChangeLog
    branches/mvm/include/ruby/mvm.h
    branches/mvm/include/ruby/ruby.h
    branches/mvm/main.c
    branches/mvm/thread_pthread.c
    branches/mvm/thread_win32.c

Index: mvm/thread_win32.c
===================================================================
--- mvm/thread_win32.c	(revision 19074)
+++ mvm/thread_win32.c	(revision 19075)
@@ -434,7 +434,7 @@
 }
 
 void
-ruby_init_stack(VALUE *addr)
+ruby_init_stack(void *addr)
 {
 }
 
Index: mvm/include/ruby/mvm.h
===================================================================
--- mvm/include/ruby/mvm.h	(revision 19074)
+++ mvm/include/ruby/mvm.h	(revision 19075)
@@ -41,4 +41,26 @@
 void ruby_vm_foreach(int (*)(rb_vm_t *, void *), void *); /* returning false stops iteration */
 void *ruby_vm_specific_ptr(rb_vm_t *, int);
 
+
+/* system level initializer */
+
+#if (defined(__APPLE__) || defined(__NeXT__)) && defined(__MACH__)
+/* to link startup code with ObjC support */
+#define RUBY_GLOBAL_SETUP static void objcdummyfunction(void) {objc_msgSend();}
+#else
+#define RUBY_GLOBAL_SETUP
+#endif
+
+void ruby_sysinit(int *, char ***);
+
+#ifdef __ia64
+void ruby_init_stack(void *, void *);
+#define ruby_init_stack(addr) ruby_init_stack(addr, rb_ia64_bsp())
+#else
+void ruby_init_stack(void *);
+#endif
+#define RUBY_INIT_STACK \
+    void *variable_in_this_stack_frame; \
+    ruby_init_stack(&variable_in_this_stack_frame);
+
 #endif /* RUBY_MVM_H */
Index: mvm/include/ruby/ruby.h
===================================================================
--- mvm/include/ruby/ruby.h	(revision 19074)
+++ mvm/include/ruby/ruby.h	(revision 19075)
@@ -945,15 +945,7 @@
 
 VALUE rb_require(const char*);
 
-#ifdef __ia64
-void ruby_init_stack(VALUE*, void*);
-#define ruby_init_stack(addr) ruby_init_stack(addr, rb_ia64_bsp())
-#else
-void ruby_init_stack(VALUE*);
-#endif
-#define RUBY_INIT_STACK \
-    VALUE variable_in_this_stack_frame; \
-    ruby_init_stack(&variable_in_this_stack_frame);
+/* obsolete */
 void ruby_init(void);
 void *ruby_options(int, char**);
 int ruby_run_node(void *);
@@ -1006,15 +998,6 @@
 static char *dln_libs_to_be_linked[] = { EXTLIB, 0 };
 #endif
 
-#if (defined(__APPLE__) || defined(__NeXT__)) && defined(__MACH__)
-/* to link startup code with ObjC support */
-#define RUBY_GLOBAL_SETUP static void objcdummyfunction(void) {objc_msgSend();}
-#else
-#define RUBY_GLOBAL_SETUP
-#endif
-
-void ruby_sysinit(int *, char ***);
-
 #define RUBY_VM 1 /* YARV */
 #define HAVE_NATIVETHREAD
 int ruby_native_thread_p(void);
Index: mvm/ChangeLog
===================================================================
--- mvm/ChangeLog	(revision 19074)
+++ mvm/ChangeLog	(revision 19075)
@@ -1,3 +1,11 @@
+Wed Sep  3 10:17:55 2008  Koichi Sasada  <ko1@a...>
+
+	* include/ruby/mvm.h, include/ruby/ruby.h, main.c: 
+	  main.c doesn't need "ruby.h" any more.
+
+	* thread_pthread.c, thread_win32.c (ruby_init_stack):
+	  change parameter type "VALUE *" to "void *".
+
 Wed Sep  3 10:04:46 2008  Koichi Sasada  <ko1@a...>
 
 	* mvm.c, eval.c, ruby.c, vm.c, vm_core.h: pass "make test".
Index: mvm/thread_pthread.c
===================================================================
--- mvm/thread_pthread.c	(revision 19074)
+++ mvm/thread_pthread.c	(revision 19075)
@@ -281,7 +281,7 @@
 
 #undef ruby_init_stack
 void
-ruby_init_stack(VALUE *addr
+ruby_init_stack(void *addr
 #ifdef __ia64
     , void *bsp
 #endif
Index: mvm/main.c
===================================================================
--- mvm/main.c	(revision 19074)
+++ mvm/main.c	(revision 19075)
@@ -10,7 +10,9 @@
 **********************************************************************/
 
 #undef RUBY_EXPORT
-#include "ruby.h"
+
+#include "ruby/mvm.h"
+
 #ifdef HAVE_LOCALE_H
 #include <locale.h>
 #endif

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