From 7ddb8fc76b8fb2aca90c383bfae3a508a3af128f Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 21 Aug 2007 04:57:06 +0000 Subject: * hash.c (st_foreach_func, rb_foreach_func): typedefed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13127 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ hash.c | 12 ++++++++---- version.h | 6 +++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 341ea8e7c4..43849ebd80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Aug 21 13:57:04 2007 Nobuyoshi Nakada + + * hash.c (st_foreach_func, rb_foreach_func): typedefed. + Mon Aug 20 17:25:33 2007 Yukihiro Matsumoto * eval.c (mnew): should preserve noex as safe_level. diff --git a/hash.c b/hash.c index 6bde55aa5d..8b33a54b56 100644 --- a/hash.c +++ b/hash.c @@ -114,9 +114,11 @@ static struct st_hash_type objhash = { rb_any_hash, }; +typedef int st_foreach_func(st_data_t, st_data_t, st_data_t); + struct foreach_safe_arg { st_table *tbl; - int (*func)(); + st_foreach_func *func; st_data_t arg; }; @@ -144,16 +146,18 @@ st_foreach_safe(table, func, a) struct foreach_safe_arg arg; arg.tbl = table; - arg.func = func; + arg.func = (st_foreach_func *)func; arg.arg = a; if (st_foreach(table, foreach_safe_i, (st_data_t)&arg)) { rb_raise(rb_eRuntimeError, "hash modified during iteration"); } } +typedef int rb_foreach_func(VALUE, VALUE, VALUE); + struct hash_foreach_arg { VALUE hash; - int (*func)(); + rb_foreach_func *func; VALUE arg; }; @@ -218,7 +222,7 @@ rb_hash_foreach(hash, func, farg) RHASH(hash)->iter_lev++; arg.hash = hash; - arg.func = func; + arg.func = (rb_foreach_func *)func; arg.arg = farg; rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, hash); } diff --git a/version.h b/version.h index e2d9338806..feb7314241 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-08-20" +#define RUBY_RELEASE_DATE "2007-08-21" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20070820 +#define RUBY_RELEASE_CODE 20070821 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 8 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_DAY 21 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3