yugui	2008-12-28 18:41:15 +0900 (Sun, 28 Dec 2008)

  New Revision: 21121

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

  Log:
    merges r21091 from trunk into ruby_1_9_1.
    * vm_insnhelper.c (vm_yield_with_cfunc): rename parameter name
      "blockptr" to "blockargptr".

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/vm_insnhelper.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21120)
+++ ruby_1_9_1/ChangeLog	(revision 21121)
@@ -1,3 +1,8 @@
+Sat Dec 27 15:23:38 2008  Koichi Sasada  <ko1@a...>
+
+	* vm_insnhelper.c (vm_yield_with_cfunc): rename parameter name
+	  "blockptr" to "blockargptr".
+
 Sat Dec 27 15:15:56 2008  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* common.mk (revision.h): ignores failure of file2lastrev.
Index: ruby_1_9_1/vm_insnhelper.c
===================================================================
--- ruby_1_9_1/vm_insnhelper.c	(revision 21120)
+++ ruby_1_9_1/vm_insnhelper.c	(revision 21121)
@@ -644,7 +644,7 @@
 static inline VALUE
 vm_yield_with_cfunc(rb_thread_t *th, const rb_block_t *block,
 		    VALUE self, int argc, const VALUE *argv,
-		    const rb_block_t *blockptr)
+		    const rb_block_t *blockargptr)
 {
     NODE *ifunc = (NODE *) block->iseq;
     VALUE val, arg, blockarg;
@@ -660,12 +660,12 @@
 	arg = argv[0];
     }
 
-    if (blockptr) {
-	if (blockptr->proc) {
-	    blockarg = blockptr->proc;
+    if (blockargptr) {
+	if (blockargptr->proc) {
+	    blockarg = blockargptr->proc;
 	}
 	else {
-	    blockarg = vm_make_proc(th, blockptr, rb_cProc);
+	    blockarg = vm_make_proc(th, blockargptr, rb_cProc);
 	}
     }
     else {

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