From 7b154ee93e66ab894e68080a6fa3b5ae6f14f93e Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 5 Dec 2009 05:45:29 +0000 Subject: [PATCH] * variable.c (obj_ivar_i): fixed argument types. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26006 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- variable.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/variable.c b/variable.c index b3f62444d2..ddeae93a1b 100644 --- a/variable.c +++ b/variable.c @@ -1142,12 +1142,13 @@ struct obj_ivar_tag { }; static int -obj_ivar_i(ID key, VALUE index, struct obj_ivar_tag *data) +obj_ivar_i(st_data_t key, st_data_t index, st_data_t arg) { + struct obj_ivar_tag *data = (struct obj_ivar_tag *)arg; if ((long)index < ROBJECT_NUMIV(data->obj)) { - VALUE val = ROBJECT_IVPTR(data->obj)[index]; + VALUE val = ROBJECT_IVPTR(data->obj)[(long)index]; if (val != Qundef) { - return (data->func)(key, val, data->arg); + return (data->func)((ID)key, val, data->arg); } } return ST_CONTINUE; @@ -1170,7 +1171,8 @@ obj_ivar_each(VALUE obj, int (*func)(ANYARGS), st_data_t arg) st_foreach_safe(tbl, obj_ivar_i, (st_data_t)&data); } -void rb_ivar_foreach(VALUE obj, int (*func)(ANYARGS), st_data_t arg) +void +rb_ivar_foreach(VALUE obj, int (*func)(ANYARGS), st_data_t arg) { switch (TYPE(obj)) { case T_OBJECT: