From 0678e0250181948c998d96219ac03eb471b53edc Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 29 Jan 2014 05:38:58 +0000 Subject: merge revision(s) 39722,43929: [Backport #9178] * enumerator.c (enumerator_with_index): try to convert given offset to integer. fix bug introduced in r39594. * enumerator.c (enumerator_with_index): should not store local variable address to memoise the arguments. it is invalidated after the return. [ruby-core:58692] [Bug #9178] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@44745 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common.mk') diff --git a/common.mk b/common.mk index ccc964701e..e48cdc5776 100644 --- a/common.mk +++ b/common.mk @@ -619,7 +619,7 @@ encoding.$(OBJEXT): {$(VPATH)}encoding.c $(RUBY_H_INCLUDES) \ {$(VPATH)}internal.h enum.$(OBJEXT): {$(VPATH)}enum.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h \ {$(VPATH)}util.h $(ID_H_INCLUDES) -enumerator.$(OBJEXT): {$(VPATH)}enumerator.c $(RUBY_H_INCLUDES) +enumerator.$(OBJEXT): {$(VPATH)}enumerator.c $(RUBY_H_INCLUDES) {$(VPATH)}node.h error.$(OBJEXT): {$(VPATH)}error.c {$(VPATH)}known_errors.inc \ $(RUBY_H_INCLUDES) $(VM_CORE_H_INCLUDES) $(ENCODING_H_INCLUDES) \ {$(VPATH)}debug.h \ -- cgit v1.2.3