yugui	2010-07-24 19:39:05 +0900 (Sat, 24 Jul 2010)

  New Revision: 28746

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

  Log:
    merges r28705 from trunk into ruby_1_9_2.
    --
    Fix signature of rb_ensure and rb_rescue to match the implementation in README.EXT

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/README.EXT

Index: ruby_1_9_2/README.EXT
===================================================================
--- ruby_1_9_2/README.EXT	(revision 28745)
+++ ruby_1_9_2/README.EXT	(revision 28746)
@@ -1188,14 +1188,14 @@
 
 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
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28745)
+++ ruby_1_9_2/ChangeLog	(revision 28746)
@@ -1,3 +1,8 @@
+Thu Jul 22 03:02:55 2010  Eric Hodel  <drbrain@s...>
+
+	* README.EXT: fix signature of rb_ensure and rb_rescue to match
+	  implementation.
+
 Tue Jul 20 12:42:06 2010  URABE Shyouhei  <shyouhei@r...>
 
 	* ext/socket/raddrinfo.c (rb_getaddrinfo): according to my

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