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 /mrbgems/mruby-numeric-ext/src/numeric_ext.c | |
| parent | 6954153fa06630aa9aaf642f8f1221cddb01793a (diff) | |
| parent | f719b0e7fff2d4754d91826b69d142c66635c3cf (diff) | |
| download | mruby-e69a13a20e0f145de644d1e229280713fe91cf6f.tar.gz mruby-e69a13a20e0f145de644d1e229280713fe91cf6f.zip | |
resolve conflict
Diffstat (limited to 'mrbgems/mruby-numeric-ext/src/numeric_ext.c')
| -rw-r--r-- | mrbgems/mruby-numeric-ext/src/numeric_ext.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mrbgems/mruby-numeric-ext/src/numeric_ext.c b/mrbgems/mruby-numeric-ext/src/numeric_ext.c index b2c0e7986..1e5d5f5d9 100644 --- a/mrbgems/mruby-numeric-ext/src/numeric_ext.c +++ b/mrbgems/mruby-numeric-ext/src/numeric_ext.c @@ -9,7 +9,7 @@ mrb_int_chr(mrb_state *mrb, mrb_value x) chr = mrb_fixnum(x); if (chr >= (1 << CHAR_BIT)) { - mrb_raisef(mrb, E_RANGE_ERROR, "%ld out of char range", chr); + mrb_raisef(mrb, E_RANGE_ERROR, "%" PRIdMRB_INT " out of char range", chr); } c = (char)chr; |