merges r28705 from trunk into ruby_1_9_2.

--
Fix signature of rb_ensure and rb_rescue to match the implementation in README.EXT

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-07-24 10:39:05 +00:00
parent 1069e98a8c
commit f06d71b5b8
2 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Thu Jul 22 03:02:55 2010 Eric Hodel <drbrain@segment7.net>
* README.EXT: fix signature of rb_ensure and rb_rescue to match
implementation.
Tue Jul 20 12:42:06 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* ext/socket/raddrinfo.c (rb_getaddrinfo): according to my

View file

@ -1188,14 +1188,14 @@ This function is obsolete since 1.9; use rb_block_call instead.
Evaluates the block with value val.
VALUE rb_rescue(VALUE (*func1)(), void *arg1, VALUE (*func2)(), void *arg2)
VALUE rb_rescue(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
Calls the function func1, with arg1 as the argument. If an exception
occurs during func1, it calls func2 with arg2 as the argument. The
return value of rb_rescue() is the return value from func1 if no
exception occurs, from func2 otherwise.
VALUE rb_ensure(VALUE (*func1)(), void *arg1, void (*func2)(), void *arg2)
VALUE rb_ensure(VALUE (*func1)(), VALUE arg1, VALUE (*func2)(), VALUE arg2)
Calls the function func1 with arg1 as the argument, then calls func2
with arg2 if execution terminated. The return value from