Browse files

resolve conflict from #1017

  • Loading branch information...
2 parents 3f85079 + 4ad08ca commit 8ae0c58bb0d207b0aaaa0dacf49fda46d77e253b @matz matz committed Mar 17, 2013
Showing with 17 additions and 8 deletions.
  1. +0 −1 include/mruby.h
  2. +0 −1 include/mruby/compile.h
  3. +0 −4 include/mruby/dump.h
  4. +2 −1 include/mruby/khash.h
  5. +1 −0 src/error.c
  6. +1 −0 src/load.c
  7. +1 −0 src/numeric.c
  8. +1 −0 src/parse.y
  9. +2 −0 src/state.c
  10. +1 −1 src/string.c
  11. +1 −0 tasks/mrbgem_spec.rake
  12. +4 −0 test/driver.c
  13. +1 −0 test/init_mrbtest.c
  14. +1 −0 tools/mirb/mirb.c
  15. +1 −0 tools/mruby/mruby.c
View
1 include/mruby.h
@@ -32,7 +32,6 @@
extern "C" {
#endif
-#include <stdlib.h>
#include "mrbconf.h"
#include "mruby/value.h"
View
1 include/mruby/compile.h
@@ -12,7 +12,6 @@ extern "C" {
#endif
#include "mruby.h"
-#include <stdio.h>
#include <setjmp.h>
/* load context */
View
4 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*);
View
3 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;
View
1 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"
View
1 src/load.c
@@ -4,6 +4,7 @@
** See Copyright Notice in mruby.h
*/
+#include <stdlib.h>
#include <string.h>
#include "mruby/dump.h"
View
1 src/numeric.c
@@ -11,6 +11,7 @@
#include <math.h>
#include <assert.h>
+#include <stdlib.h>
#if defined(__FreeBSD__) && __FreeBSD__ < 4
#include <floatingpoint.h>
View
1 src/parse.y
@@ -25,6 +25,7 @@
#include <errno.h>
#include <ctype.h>
#include <string.h>
+#include <stdlib.h>
#define YYLEX_PARAM p
View
2 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*);
View
2 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"
View
1 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"]
View
4 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>
View
1 test/init_mrbtest.c
@@ -1,3 +1,4 @@
+#include <stdlib.h>
#include "mruby.h"
#include "mruby/irep.h"
#include "mruby/dump.h"
View
1 tools/mirb/mirb.c
@@ -6,6 +6,7 @@
** immediately. It's a REPL...
*/
+#include <stdlib.h>
#include <string.h>
#include <mruby.h>
View
1 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

0 comments on commit 8ae0c58

Please sign in to comment.