diff options
Diffstat (limited to 'src')
| -rwxr-xr-x[-rw-r--r--] | src/class.c | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/dump.c | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/parse.y | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/vm.c | 9 |
4 files changed, 15 insertions, 4 deletions
diff --git a/src/class.c b/src/class.c index 40335e039..0a29c3f63 100644..100755 --- a/src/class.c +++ b/src/class.c @@ -837,7 +837,7 @@ mrb_mod_included_modules(mrb_state *mrb, mrb_value self) return result; } -mrb_value class_instance_method_list(mrb_state*, int, struct RClass*, int); +mrb_value class_instance_method_list(mrb_state*, mrb_bool, struct RClass*, int); /* 15.2.2.4.33 */ /* diff --git a/src/dump.c b/src/dump.c index 209b0d369..b4a6e9382 100644..100755 --- a/src/dump.c +++ b/src/dump.c @@ -12,6 +12,8 @@ #include "mruby/irep.h" #include "mruby/numeric.h" +int sprintf(char*, const char*, ...); + static size_t get_irep_record_size(mrb_state *mrb, mrb_irep *irep); diff --git a/src/parse.y b/src/parse.y index 816b4cec9..5eaa61b2a 100644..100755 --- a/src/parse.y +++ b/src/parse.y @@ -763,7 +763,7 @@ new_nth_ref(parser_state *p, int n) static node* new_heredoc(parser_state *p) { - parser_heredoc_info *inf = parser_palloc(p, sizeof(parser_heredoc_info)); + parser_heredoc_info *inf = (parser_heredoc_info *)parser_palloc(p, sizeof(parser_heredoc_info)); return cons((node*)NODE_HEREDOC, (node*)inf); } @@ -3415,7 +3415,7 @@ scan_hex(const int *start, int len, int *retlen) char *tmp; /* assert(len <= 2) */ - while (len-- && *s && (tmp = strchr(hexdigit, *s))) { + while (len-- && *s && (tmp = (char*)strchr(hexdigit, *s))) { retval <<= 4; retval |= (tmp - hexdigit) & 15; s++; @@ -3773,7 +3773,7 @@ heredoc_identifier(parser_state *p) info->term_len = toklen(p); if (! quote) type |= STR_FUNC_EXPAND; - info->type = type; + info->type = (string_type)type; info->allow_indent = indent; info->line_head = TRUE; info->doc = NULL; diff --git a/src/vm.c b/src/vm.c index 8da774b4b..4b2198195 100644..100755 --- a/src/vm.c +++ b/src/vm.c @@ -22,6 +22,15 @@ #include "opcode.h" #include "value_array.h" +#ifndef ENABLE_STDIO +#if defined(__cplusplus) +extern "C" { +#endif +void abort(void); +#if defined(__cplusplus) +} /* extern "C" { */ +#endif +#endif #define SET_TRUE_VALUE(r) MRB_SET_VALUE(r, MRB_TT_TRUE, value.i, 1) #define SET_FALSE_VALUE(r) MRB_SET_VALUE(r, MRB_TT_FALSE, value.i, 1) |
