summaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2012-07-29 17:42:17 -0700
committerYukihiro "Matz" Matsumoto <[email protected]>2012-07-29 17:42:17 -0700
commitff707384c37c2b12623055c00ba8b9a23aca9974 (patch)
tree0586e062177c9cdd61be6074db8c5513e436b110 /tools
parentd0c1b7b4a8cad2c5a01ccfbe97ffd0381f592f39 (diff)
parent50b9f54a6527477d825049c4f0a8f14f7bb4482c (diff)
downloadmruby-ff707384c37c2b12623055c00ba8b9a23aca9974.tar.gz
mruby-ff707384c37c2b12623055c00ba8b9a23aca9974.zip
Merge pull request #407 from silverhammermba/cpp
C++ compatibility
Diffstat (limited to 'tools')
-rw-r--r--tools/mruby/mruby.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c
index 26b1e44d5..e6a088672 100644
--- a/tools/mruby/mruby.c
+++ b/tools/mruby/mruby.c
@@ -86,12 +86,12 @@ append_cmdline:
if (!args->cmdline) {
char *buf;
- buf = mrb_malloc(mrb, strlen(item)+1);
+ buf = (char *)mrb_malloc(mrb, strlen(item)+1);
strcpy(buf, item);
args->cmdline = buf;
}
else {
- args->cmdline = mrb_realloc(mrb, args->cmdline, strlen(args->cmdline)+strlen(item)+2);
+ args->cmdline = (char *)mrb_realloc(mrb, args->cmdline, strlen(args->cmdline)+strlen(item)+2);
strcat(args->cmdline, "\n");
strcat(args->cmdline, item);
}
@@ -133,7 +133,7 @@ append_cmdline:
return 0;
}
}
- args->argv = mrb_realloc(mrb, args->argv, sizeof(char*) * (argc + 1));
+ args->argv = (char **)mrb_realloc(mrb, args->argv, sizeof(char*) * (argc + 1));
memcpy(args->argv, argv, (argc+1) * sizeof(char*));
args->argc = argc;