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 /include | |
| parent | 3f85079cc045012285ce432b446b77eab82de7fe (diff) | |
| parent | 4ad08caca0b90ff7ef4b4f0080c54004f858d597 (diff) | |
| download | mruby-8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b.tar.gz mruby-8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b.zip | |
resolve conflict from #1017
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby.h | 1 | ||||
| -rw-r--r-- | include/mruby/compile.h | 1 | ||||
| -rw-r--r-- | include/mruby/dump.h | 4 | ||||
| -rw-r--r-- | include/mruby/khash.h | 3 |
4 files changed, 2 insertions, 7 deletions
diff --git a/include/mruby.h b/include/mruby.h index 2d2bc64cc..6411f4bdb 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -32,7 +32,6 @@ extern "C" { #endif -#include <stdlib.h> #include "mrbconf.h" #include "mruby/value.h" diff --git a/include/mruby/compile.h b/include/mruby/compile.h index a50c85e42..382a5e6ff 100644 --- a/include/mruby/compile.h +++ b/include/mruby/compile.h @@ -12,7 +12,6 @@ extern "C" { #endif #include "mruby.h" -#include <stdio.h> #include <setjmp.h> /* load context */ diff --git a/include/mruby/dump.h b/include/mruby/dump.h index 8b78e74d0..196eefb3b 100644 --- a/include/mruby/dump.h +++ b/include/mruby/dump.h @@ -12,10 +12,6 @@ extern "C" { #endif #include "mruby.h" -#ifdef ENABLE_STDIO -#include <stdio.h> -#endif -#include <stdint.h> #ifdef ENABLE_STDIO int mrb_dump_irep(mrb_state*,int,FILE*); diff --git a/include/mruby/khash.h b/include/mruby/khash.h index 373e54b13..db8048f5a 100644 --- a/include/mruby/khash.h +++ b/include/mruby/khash.h @@ -11,7 +11,8 @@ extern "C" { #endif -#include <stdint.h> +#include "mruby.h" +#include <string.h> typedef uint32_t khint_t; typedef khint_t khiter_t; |