summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--vm_insnhelper.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 89e4118351..6d0e8e0130 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 6 17:56:40 2013 Koichi Sasada <ko1@atdot.net>
+
+ * vm_insnhelper.c (vm_push_frame): change type of stack_max to size_t.
+
Tue Aug 6 17:42:47 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* range.c (range_last): exclude the last number of the exclusive range
diff --git a/vm_insnhelper.c b/vm_insnhelper.c
index b4f2b83010..1d0b225dbd 100644
--- a/vm_insnhelper.c
+++ b/vm_insnhelper.c
@@ -41,13 +41,13 @@ vm_push_frame(rb_thread_t *th,
VALUE *sp,
int local_size,
const rb_method_entry_t *me,
- int stack_max)
+ size_t stack_max)
{
rb_control_frame_t *const cfp = th->cfp - 1;
int i;
/* check stack overflow */
- CHECK_VM_STACK_OVERFLOW0(cfp, sp, local_size + stack_max);
+ CHECK_VM_STACK_OVERFLOW0(cfp, sp, local_size + (int)stack_max);
th->cfp = cfp;