diff options
| author | mattn <[email protected]> | 2013-01-08 15:33:51 +0900 |
|---|---|---|
| committer | mattn <[email protected]> | 2013-01-08 15:33:51 +0900 |
| commit | ec22d5ba41e93c9d1f25c5cdd5c1d2999d9114b4 (patch) | |
| tree | 5c9d3fc137e4b908d5363725e356ab3b0c5300bc /include | |
| parent | cb158653ae4e44409edb91cbd828e69563467841 (diff) | |
| parent | 0f98227dfc86419e4b1cb6b748da0fe54203063d (diff) | |
| download | mruby-ec22d5ba41e93c9d1f25c5cdd5c1d2999d9114b4.tar.gz mruby-ec22d5ba41e93c9d1f25c5cdd5c1d2999d9114b4.zip | |
Merge branch 'master' of https://github.com/mruby/mruby
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby/array.h | 1 | ||||
| -rw-r--r-- | include/mruby/cdump.h | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/mruby/array.h b/include/mruby/array.h index 2857ec75d..c5959bbe6 100644 --- a/include/mruby/array.h +++ b/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" { */ diff --git a/include/mruby/cdump.h b/include/mruby/cdump.h index 14a365081..6afbb985e 100644 --- a/include/mruby/cdump.h +++ b/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); |