summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-19 16:16:55 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-04-19 16:16:55 +0000
commit26de612013813687e11793c7d991b03a0982c8e0 (patch)
treed5956e6f8731c7dc66da495abac1536453f5966e /thread.c
parenta569165d3e6ef80fef747a33d8c47325e23c4430 (diff)
merge revision(s) 40000: [Backport #8097]
* thread.c (rb_mutex_synchronize_m): yield no block params. patch by splattael (Peter Suschlik) in [ruby-core:53773] [Bug #8097]. fix GH-266. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40380 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/thread.c b/thread.c
index ffb266c64d..60640d9445 100644
--- a/thread.c
+++ b/thread.c
@@ -4521,7 +4521,7 @@ rb_mutex_synchronize_m(VALUE self, VALUE args)
rb_raise(rb_eThreadError, "must be called with a block");
}
- return rb_mutex_synchronize(self, rb_yield, Qnil);
+ return rb_mutex_synchronize(self, rb_yield, Qundef);
}
void rb_mutex_allow_trap(VALUE self, int val)