nobu	2010-02-17 17:15:04 +0900 (Wed, 17 Feb 2010)

  New Revision: 26696

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

  Log:
    * thread_pthread.c (native_thread_init_stack): fixed merge miss.
    
    * variable.c (rb_ivar_count): ditto.

  Modified files:
    branches/mvm/thread_pthread.c
    branches/mvm/variable.c

Index: mvm/thread_pthread.c
===================================================================
--- mvm/thread_pthread.c	(revision 26695)
+++ mvm/thread_pthread.c	(revision 26696)
@@ -353,9 +353,9 @@
 	    th->machine_stack_maxsize = size;
 	}
 #else
-    th->machine_stack_start = native_main_thread.stack_start;
-    th->machine_stack_maxsize = native_main_thread.stack_maxsize;
+	rb_raise(rb_eNotImpError, "ruby engine can initialize only in the main thread");
 #endif
+    }
 #ifdef __ia64
     th->machine_stack_maxsize += sizeof(VALUE);
 #ifdef STACKADDR_AVAILABLE
Index: mvm/variable.c
===================================================================
--- mvm/variable.c	(revision 26695)
+++ mvm/variable.c	(revision 26696)
@@ -1311,7 +1311,9 @@
 st_index_t
 rb_ivar_count(VALUE obj)
 {
+    VALUE generic_iv = rb_generic_iv_tbl;
     st_table *tbl;
+
     switch (TYPE(obj)) {
       case T_OBJECT:
 	if ((tbl = ROBJECT_IV_INDEX_TBL(obj)) != 0) {
@@ -1332,7 +1334,7 @@
 	}
 	break;
       default:
-	if (!generic_iv_tbl) break;
+	if (!generic_iv) break;
 	if (FL_TEST(obj, FL_EXIVAR) || rb_special_const_p(obj)) {
 	    st_data_t data;
 

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