diff options
| author | Tomasz Dąbrowski <[email protected]> | 2016-11-22 13:19:05 +0100 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2016-11-24 09:28:00 +0900 |
| commit | 1af9e363f28810e46e263cd13da918cdf779d71d (patch) | |
| tree | b0bc03c71721bc62a5435111c3bf0f9c9dc0ce0d /src | |
| parent | 477e12c1821b5d6c845b5c80c7dd238bebc61f73 (diff) | |
| download | mruby-1af9e363f28810e46e263cd13da918cdf779d71d.tar.gz mruby-1af9e363f28810e46e263cd13da918cdf779d71d.zip | |
Fixes for compiling mruby as C++
Diffstat (limited to 'src')
| -rw-r--r-- | src/backtrace.c | 4 | ||||
| -rw-r--r-- | src/string.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/backtrace.c b/src/backtrace.c index 11082b705..285af562f 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -160,7 +160,7 @@ static void output_backtrace_i(mrb_state *mrb, struct backtrace_location_raw *loc_raw, void *data) { struct backtrace_location loc; - struct output_backtrace_args *args = data; + struct output_backtrace_args *args = (struct output_backtrace_args *)data; loc.i = loc_raw->i; loc.lineno = loc_raw->lineno; @@ -338,7 +338,7 @@ save_backtrace_i(mrb_state *mrb, else { new_n_allocated = mrb->backtrace.n_allocated * 2; } - mrb->backtrace.entries = + mrb->backtrace.entries = (mrb_backtrace_entry *) mrb_realloc(mrb, mrb->backtrace.entries, sizeof(mrb_backtrace_entry) * new_n_allocated); diff --git a/src/string.c b/src/string.c index f8ab9478f..5e490bf03 100644 --- a/src/string.c +++ b/src/string.c @@ -361,7 +361,7 @@ mrb_memsearch(const void *x0, mrb_int m, const void *y0, mrb_int n) return 0; } else if (m == 1) { - const unsigned char *ys = memchr(y, *x, n); + const unsigned char *ys = (const unsigned char *)memchr(y, *x, n); if (ys) return ys - y; |