nobu	2011-09-15 11:39:49 +0900 (Thu, 15 Sep 2011)

  New Revision: 33273

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

  Log:
    * gc.c (mark_entry, mark_key, mark_keyvalue): adjust callback
      argument types.

  Modified files:
    trunk/ChangeLog
    trunk/gc.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33272)
+++ ChangeLog	(revision 33273)
@@ -1,3 +1,8 @@
+Thu Sep 15 11:39:43 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* gc.c (mark_entry, mark_key, mark_keyvalue): adjust callback
+	  argument types.
+
 Thu Sep 15 01:44:10 2011  Ayumu AIZAWA  <ayumu.aizawa@g...>
 
 	* ext/tk/*: Change encoding from EUC-JP to UTF-8
Index: gc.c
===================================================================
--- gc.c	(revision 33272)
+++ gc.c	(revision 33273)
@@ -1444,10 +1444,10 @@
 };
 
 static int
-mark_entry(ID key, VALUE value, st_data_t data)
+mark_entry(st_data_t key, st_data_t value, st_data_t data)
 {
     struct mark_tbl_arg *arg = (void*)data;
-    gc_mark(arg->objspace, value, arg->lev);
+    gc_mark(arg->objspace, (VALUE)value, arg->lev);
     return ST_CONTINUE;
 }
 
@@ -1462,10 +1462,10 @@
 }
 
 static int
-mark_key(VALUE key, VALUE value, st_data_t data)
+mark_key(st_data_t key, st_data_t value, st_data_t data)
 {
     struct mark_tbl_arg *arg = (void*)data;
-    gc_mark(arg->objspace, key, arg->lev);
+    gc_mark(arg->objspace, (VALUE)key, arg->lev);
     return ST_CONTINUE;
 }
 
@@ -1486,11 +1486,11 @@
 }
 
 static int
-mark_keyvalue(VALUE key, VALUE value, st_data_t data)
+mark_keyvalue(st_data_t key, st_data_t value, st_data_t data)
 {
     struct mark_tbl_arg *arg = (void*)data;
-    gc_mark(arg->objspace, key, arg->lev);
-    gc_mark(arg->objspace, value, arg->lev);
+    gc_mark(arg->objspace, (VALUE)key, arg->lev);
+    gc_mark(arg->objspace, (VALUE)value, arg->lev);
     return ST_CONTINUE;
 }
 

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