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 /src | |
| parent | 3f85079cc045012285ce432b446b77eab82de7fe (diff) | |
| parent | 4ad08caca0b90ff7ef4b4f0080c54004f858d597 (diff) | |
| download | mruby-8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b.tar.gz mruby-8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b.zip | |
resolve conflict from #1017
Diffstat (limited to 'src')
| -rw-r--r-- | src/error.c | 1 | ||||
| -rw-r--r-- | src/load.c | 1 | ||||
| -rw-r--r-- | src/numeric.c | 1 | ||||
| -rw-r--r-- | src/parse.y | 1 | ||||
| -rw-r--r-- | src/state.c | 2 | ||||
| -rw-r--r-- | src/string.c | 2 |
6 files changed, 7 insertions, 1 deletions
diff --git a/src/error.c b/src/error.c index 488ab6cef..ddf92382b 100644 --- a/src/error.c +++ b/src/error.c @@ -7,6 +7,7 @@ #include "mruby.h" #include <errno.h> #include <stdarg.h> +#include <stdlib.h> #include <setjmp.h> #include <string.h> #include "error.h" diff --git a/src/load.c b/src/load.c index 9b5d015ed..fcffcd9de 100644 --- a/src/load.c +++ b/src/load.c @@ -4,6 +4,7 @@ ** See Copyright Notice in mruby.h */ +#include <stdlib.h> #include <string.h> #include "mruby/dump.h" diff --git a/src/numeric.c b/src/numeric.c index 61b9a2f73..5560bbc7f 100644 --- a/src/numeric.c +++ b/src/numeric.c @@ -11,6 +11,7 @@ #include <math.h> #include <assert.h> +#include <stdlib.h> #if defined(__FreeBSD__) && __FreeBSD__ < 4 #include <floatingpoint.h> diff --git a/src/parse.y b/src/parse.y index 90e38e0be..931128873 100644 --- a/src/parse.y +++ b/src/parse.y @@ -25,6 +25,7 @@ #include <errno.h> #include <ctype.h> #include <string.h> +#include <stdlib.h> #define YYLEX_PARAM p diff --git a/src/state.c b/src/state.c index 0c2207ad7..ba7699f8a 100644 --- a/src/state.c +++ b/src/state.c @@ -7,6 +7,8 @@ #include "mruby.h" #include "mruby/irep.h" #include "mruby/variable.h" +#include <stdlib.h> +#include <string.h> void mrb_init_heap(mrb_state*); void mrb_init_core(mrb_state*); diff --git a/src/string.c b/src/string.c index d474f6f96..32daaa3b5 100644 --- a/src/string.c +++ b/src/string.c @@ -6,8 +6,8 @@ #include "mruby.h" -#include <stdint.h> #include <stddef.h> +#include <stdlib.h> #include <string.h> #include "mruby/string.h" #include "mruby/class.h" |