diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-09-29 00:18:39 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-09-29 00:18:39 +0900 |
| commit | 29a9e698e33f89c18cd8f9622bd503aa55df2f51 (patch) | |
| tree | e83110a7db0edaa3a6c191abe850ed7b657f766e /include/mruby.h | |
| parent | 381850280c036116adaffe42cc420da9c71d28a2 (diff) | |
| parent | 999ce87129fb9216ae746140aa716a764a79b354 (diff) | |
| download | mruby-29a9e698e33f89c18cd8f9622bd503aa55df2f51.tar.gz mruby-29a9e698e33f89c18cd8f9622bd503aa55df2f51.zip | |
Merge pull request #3815 from dabroz/fix-warnings
Fix MSVC 14.0 warnings
Diffstat (limited to 'include/mruby.h')
| -rw-r--r-- | include/mruby.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mruby.h b/include/mruby.h index ced9c104d..316707909 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -858,7 +858,7 @@ mrb_get_mid(mrb_state *mrb) /* get method symbol */ return mrb->c->ci->mid; } -static inline int +static inline mrb_int mrb_get_argc(mrb_state *mrb) /* get argc */ { return mrb->c->ci->argc; @@ -1054,7 +1054,7 @@ MRB_API mrb_sym mrb_obj_to_sym(mrb_state *mrb, mrb_value name); MRB_API mrb_bool mrb_obj_eq(mrb_state*, mrb_value, mrb_value); MRB_API mrb_bool mrb_obj_equal(mrb_state*, mrb_value, mrb_value); MRB_API mrb_bool mrb_equal(mrb_state *mrb, mrb_value obj1, mrb_value obj2); -MRB_API mrb_value mrb_convert_to_integer(mrb_state *mrb, mrb_value val, int base); +MRB_API mrb_value mrb_convert_to_integer(mrb_state *mrb, mrb_value val, mrb_int base); MRB_API mrb_value mrb_Integer(mrb_state *mrb, mrb_value val); MRB_API mrb_value mrb_Float(mrb_state *mrb, mrb_value val); MRB_API mrb_value mrb_inspect(mrb_state *mrb, mrb_value obj); |