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 /test | |
| parent | 3f85079cc045012285ce432b446b77eab82de7fe (diff) | |
| parent | 4ad08caca0b90ff7ef4b4f0080c54004f858d597 (diff) | |
| download | mruby-8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b.tar.gz mruby-8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b.zip | |
resolve conflict from #1017
Diffstat (limited to 'test')
| -rw-r--r-- | test/driver.c | 4 | ||||
| -rw-r--r-- | test/init_mrbtest.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/test/driver.c b/test/driver.c index 43c5b8963..acf79df05 100644 --- a/test/driver.c +++ b/test/driver.c @@ -5,6 +5,10 @@ ** against the current mruby implementation. */ + +#include <stdlib.h> +#include <string.h> + #include <mruby.h> #include <mruby/proc.h> #include <mruby/data.h> diff --git a/test/init_mrbtest.c b/test/init_mrbtest.c index 6b2219b6f..973029c8f 100644 --- a/test/init_mrbtest.c +++ b/test/init_mrbtest.c @@ -1,3 +1,4 @@ +#include <stdlib.h> #include "mruby.h" #include "mruby/irep.h" #include "mruby/dump.h" |