From 309ac6447d67fe87d956d01d2491542d6f56818f Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 27 May 2014 04:54:29 +0000
Subject: merge revision(s) 45564,45565,45584,45585: [Backport #9721]

	* proc.c (rb_method_call_with_block, umethod_bind): call with
	  IClass including the module for a module instance method.
	  [ruby-core:61936] [Bug #9721]

	* vm_insnhelper.c (vm_search_super_method): allow bound
	  UnboundMethod case.

	* proc.c (umethod_bind): use the ancestor iclass instead of new
	  iclass to get rid of infinite recursion, if the defined module
	  is already included.  [ruby-core:62014] [Bug #9721]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@46157 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 internal.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'internal.h')

diff --git a/internal.h b/internal.h
index 82890b04da..aded941637 100644
--- a/internal.h
+++ b/internal.h
@@ -183,6 +183,7 @@ VALUE rb_int_pred(VALUE num);
 
 /* object.c */
 VALUE rb_obj_equal(VALUE obj1, VALUE obj2);
+VALUE rb_class_search_ancestor(VALUE klass, VALUE super);
 
 /* parse.y */
 VALUE rb_parser_get_yydebug(VALUE);
-- 
cgit v1.2.3