diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-01-29 05:35:38 -0800 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-01-29 05:35:38 -0800 |
| commit | 1724042225c4a4ce8b2222569c5b86937729d11a (patch) | |
| tree | 8e3ce5c48559aa4e3b18f3c274ecdd78a031d494 | |
| parent | e18a9c0a56aebcee004cd039c97667b56106e6aa (diff) | |
| parent | 5a681874dd8fbd5446615710fcd4320a2f1438c9 (diff) | |
| download | mruby-1724042225c4a4ce8b2222569c5b86937729d11a.tar.gz mruby-1724042225c4a4ce8b2222569c5b86937729d11a.zip | |
Merge pull request #766 from masuidrive/mrbint64
Fixed MRB_INT64 warning
| -rw-r--r-- | include/mrbconf.h | 19 | ||||
| -rw-r--r-- | src/cdump.c | 2 |
2 files changed, 14 insertions, 7 deletions
diff --git a/include/mrbconf.h b/include/mrbconf.h index 066c040f6..17f6a0fc3 100644 --- a/include/mrbconf.h +++ b/include/mrbconf.h @@ -76,7 +76,8 @@ typedef int32_t mrb_int; # define MRB_INT_MIN INT32_MIN # define MRB_INT_MAX INT32_MAX -# define mrb_int_to_str(buf, i) sprintf((buf), "%d", (i)) +# define MRB_INT_FORMAT PRId32 +# define mrb_int_to_str(buf, i) sprintf((buf), "%" MRB_INT_FORMAT, (i)) # define str_to_mrb_int(buf) (mrb_int)strtol((buf), NULL, 10) # endif #else @@ -84,13 +85,15 @@ typedef int64_t mrb_int; # define MRB_INT_MIN INT64_MIN # define MRB_INT_MAX INT64_MAX -# define mrb_int_to_str(buf, i) sprintf((buf), "%ld", (i)) +# define MRB_INT_FORMAT PRId64 +# define mrb_int_to_str(buf, i) sprintf((buf), "%" MRB_INT_FORMAT, (i)) # define str_to_mrb_int(buf) (mrb_int)strtoll((buf), NULL, 10) # else - typedef int mrb_int; -# define MRB_INT_MIN INT_MIN -# define MRB_INT_MAX INT_MAX -# define mrb_int_to_str(buf, i) sprintf((buf), "%d", (i)) + typedef int32_t mrb_int; +# define MRB_INT_MIN INT32_MIN +# define MRB_INT_MAX INT32_MAX +# define MRB_INT_FORMAT PRId32 +# define mrb_int_to_str(buf, i) sprintf((buf), "%" MRB_INT_FORMAT, (i)) # define str_to_mrb_int(buf) (mrb_int)strtol((buf), NULL, 10) # endif #endif @@ -131,6 +134,10 @@ typedef short mrb_sym; # define isnan _isnan # define isinf(n) (!_finite(n) && !_isnan(n)) # define strtoll _strtoi64 +# define PRId32 "I32d" +# define PRId64 "I64d" +#else +# include <inttypes.h> #endif #endif /* MRUBYCONF_H */ diff --git a/src/cdump.c b/src/cdump.c index 247511f5a..7beb3544f 100644 --- a/src/cdump.c +++ b/src/cdump.c @@ -145,7 +145,7 @@ make_cdump_irep(mrb_state *mrb, int irep_no, FILE *f) case MRB_TT_FLOAT: SOURCE_CODE(" irep->pool[%d] = mrb_float_value(%.16e);", n, mrb_float(irep->pool[n])); break; case MRB_TT_FIXNUM: - SOURCE_CODE(" irep->pool[%d] = mrb_fixnum_value(%d);", n, mrb_fixnum(irep->pool[n])); break; + SOURCE_CODE(" irep->pool[%d] = mrb_fixnum_value(%" MRB_INT_FORMAT ");", n, mrb_fixnum(irep->pool[n])); break; case MRB_TT_STRING: str_len = str_format_len(irep->pool[n]) + 1; if ( str_len > buf_len ) { |