diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-24 00:44:28 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-24 00:44:28 +0900 |
| commit | e69a13a20e0f145de644d1e229280713fe91cf6f (patch) | |
| tree | 26503e78864d41062aaa3c53c1f55cc72cf50993 /src | |
| parent | 6954153fa06630aa9aaf642f8f1221cddb01793a (diff) | |
| parent | f719b0e7fff2d4754d91826b69d142c66635c3cf (diff) | |
| download | mruby-e69a13a20e0f145de644d1e229280713fe91cf6f.tar.gz mruby-e69a13a20e0f145de644d1e229280713fe91cf6f.zip | |
resolve conflict
Diffstat (limited to 'src')
| -rw-r--r-- | src/array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/array.c b/src/array.c index 61b27a678..ba289997f 100644 --- a/src/array.c +++ b/src/array.c @@ -578,7 +578,7 @@ mrb_ary_set(mrb_state *mrb, mrb_value ary, mrb_int n, mrb_value val) /* rb_ary_s if (n < 0) { n += a->len; if (n < 0) { - mrb_raisef(mrb, E_INDEX_ERROR, "index %ld out of array", n - a->len); + mrb_raisef(mrb, E_INDEX_ERROR, "index %" PRIdMRB_INT " out of array", n - a->len); } } if (a->len <= (int)n) { |