resolve conflict from #1017

include/mruby.h

@@ -32,7 +32,6 @@
 extern "C" {
 #endif
 
-#include <stdlib.h>
 #include "mrbconf.h"
 
 #include "mruby/value.h"

include/mruby/compile.h

@@ -12,7 +12,6 @@ extern "C" {
 #endif
 
 #include "mruby.h"
-#include <stdio.h>
 #include <setjmp.h>
 
 /* load context */

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*);

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;

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"

src/load.c

@@ -4,6 +4,7 @@
 ** See Copyright Notice in mruby.h
 */
 
+#include <stdlib.h>
 #include <string.h>
 #include "mruby/dump.h"
 

src/numeric.c

@@ -11,6 +11,7 @@
 
 #include <math.h>
 #include <assert.h>
+#include <stdlib.h>
 
 #if defined(__FreeBSD__) && __FreeBSD__ < 4
 #include <floatingpoint.h>

src/parse.y

@@ -25,6 +25,7 @@
 #include <errno.h>
 #include <ctype.h>
 #include <string.h>
+#include <stdlib.h>
 
 #define YYLEX_PARAM p
 

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*);

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"

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"]

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>

test/init_mrbtest.c

@@ -1,3 +1,4 @@
+#include <stdlib.h>
 #include "mruby.h"
 #include "mruby/irep.h"
 #include "mruby/dump.h"

tools/mirb/mirb.c

@@ -6,6 +6,7 @@
 ** immediately. It's a REPL...
 */
 
+#include <stdlib.h>
 #include <string.h>
 
 #include <mruby.h>

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