summaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorYukihiro Matz Matsumoto <[email protected]>2013-03-27 00:52:24 +0900
committerYukihiro Matz Matsumoto <[email protected]>2013-03-27 00:52:24 +0900
commita0f6e4d58edc296b0a3f8a3f7be5ab62ff61604d (patch)
tree5c2c21a850129b3d596034d81bcdf063613305a4 /tools
parent1abe678e1c0a5fd153c07d71634f262fd51b7668 (diff)
parent974febd315a6520184f95cb50a7c2b46e4582002 (diff)
downloadmruby-a0f6e4d58edc296b0a3f8a3f7be5ab62ff61604d.tar.gz
mruby-a0f6e4d58edc296b0a3f8a3f7be5ab62ff61604d.zip
resolve conflict from #964
Diffstat (limited to 'tools')
-rw-r--r--tools/mrbc/mrbc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/mrbc/mrbc.c b/tools/mrbc/mrbc.c
index 09ab2ca1d..6535d5636 100644
--- a/tools/mrbc/mrbc.c
+++ b/tools/mrbc/mrbc.c
@@ -209,10 +209,10 @@ main(int argc, char **argv)
return EXIT_SUCCESS;
}
if (args.initname) {
- n = mrb_bdump_irep(mrb, n, args.wfp, args.initname);
+ n = mrb_dump_irep_cfunc(mrb, n, args.wfp, args.initname);
}
else {
- n = mrb_dump_irep(mrb, n, args.wfp);
+ n = mrb_dump_irep_binary(mrb, n, args.wfp);
}
cleanup(mrb, &args);