diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-17 00:28:49 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2013-03-17 00:28:49 +0900 |
| commit | 8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b (patch) | |
| tree | f55227fc4ac88eb640688e31451028a2910de618 /tools | |
| parent | 3f85079cc045012285ce432b446b77eab82de7fe (diff) | |
| parent | 4ad08caca0b90ff7ef4b4f0080c54004f858d597 (diff) | |
| download | mruby-8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b.tar.gz mruby-8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b.zip | |
resolve conflict from #1017
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mirb/mirb.c | 1 | ||||
| -rw-r--r-- | tools/mruby/mruby.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/mirb/mirb.c b/tools/mirb/mirb.c index bd03a6534..06ae16f5b 100644 --- a/tools/mirb/mirb.c +++ b/tools/mirb/mirb.c @@ -6,6 +6,7 @@ ** immediately. It's a REPL... */ +#include <stdlib.h> #include <string.h> #include <mruby.h> diff --git a/tools/mruby/mruby.c b/tools/mruby/mruby.c index c509c0d30..1caf32b6a 100644 --- a/tools/mruby/mruby.c +++ b/tools/mruby/mruby.c @@ -6,6 +6,7 @@ #include "mruby/dump.h" #include "mruby/variable.h" #include <stdio.h> +#include <stdlib.h> #include <string.h> #ifndef ENABLE_STDIO |
