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/string.c | |
| parent | 3f85079cc045012285ce432b446b77eab82de7fe (diff) | |
| parent | 4ad08caca0b90ff7ef4b4f0080c54004f858d597 (diff) | |
| download | mruby-8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b.tar.gz mruby-8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b.zip | |
resolve conflict from #1017
Diffstat (limited to 'src/string.c')
| -rw-r--r-- | src/string.c | 2 |
1 files changed, 1 insertions, 1 deletions
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" |