resolve conflict from #1017

15 files changed, 17 insertions, 8 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;
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"
diff --git a/tasks/mrbgem_spec.rake b/tasks/mrbgem_spec.rake
index 649f99d0e..4b2ce6499 100644
--- a/tasks/mrbgem_spec.rake
+++ b/tasks/mrbgem_spec.rake
@@ -145,6 +145,7 @@ module MRuby
         f.puts %Q[ *   This file was generated!]
         f.puts %Q[ *   All manual changes will get lost.]
         f.puts %Q[ */]
+        f.puts %Q[#include <stdlib.h>]
         f.puts %Q[#include "mruby.h"]
         f.puts %Q[#include "mruby/irep.h"]
         f.puts %Q[#include "mruby/dump.h"]
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"
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