2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 71f5470046..a95c72a73a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 19 16:34:14 2012  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* enum.c (zip_i):  variadic argument needs explicit cast on the
+	  platforms where VALUE is longer than int.
+
 Mon Mar 19 15:36:41 2012  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* enumerator.c (enumerable_lazy): add an example of take and first
diff --git a/enum.c b/enum.c
index fd5ba1cd48..24db7b23f1 100644
--- a/enum.c
+++ b/enum.c
@@ -1943,7 +1943,7 @@ zip_i(VALUE val, NODE *memo, int argc, VALUE *argv)
 	    VALUE v[2];
 
 	    v[1] = RARRAY_PTR(args)[i];
-	    rb_rescue2(call_next, (VALUE)v, call_stop, (VALUE)v, rb_eStopIteration, 0);
+	    rb_rescue2(call_next, (VALUE)v, call_stop, (VALUE)v, rb_eStopIteration, (VALUE)0);
 	    if (v[0] == Qundef) {
 		RARRAY_PTR(args)[i] = Qnil;
 		v[0] = Qnil;