Merge branch 'master' of https://github.com/mruby/mruby

include/mruby/array.h

@@ -55,6 +55,7 @@ mrb_value mrb_ary_new4(mrb_state *mrb, int n, const mrb_value *elts);
 mrb_value mrb_assoc_new(mrb_state *mrb, mrb_value car, mrb_value cdr);
 mrb_value mrb_ary_entry(mrb_value ary, int offset);
 mrb_value mrb_ary_shift(mrb_state *mrb, mrb_value self);
+mrb_value mrb_ary_clear(mrb_state *mrb, mrb_value self);
 
 #if defined(__cplusplus)
 }  /* extern "C" { */

include/mruby/cdump.h

@@ -12,7 +12,11 @@ extern "C" {
 #endif
 
 #include "mruby.h"
-#include <stdio.h>
+#ifdef DISABLE_STDIO
+# error "Configuration conflict. Can't use with DISABLE_STDIO option."
+#else
+# include <stdio.h>
+#endif
 
 int mrb_cdump_irep(mrb_state *mrb, int n, FILE *f,const char *initname);