diff options
| author | Daniel Bovensiepen <[email protected]> | 2013-01-08 10:07:55 +0800 |
|---|---|---|
| committer | Daniel Bovensiepen <[email protected]> | 2013-01-08 10:07:55 +0800 |
| commit | a096dc9e3b01f4fc31fc1f910e254813884a776e (patch) | |
| tree | cd353be9cb1df5e009d130ceabfcd627e7fb34a7 /include | |
| parent | af75d8de2ca6b3eda97c588334b15920e856a53b (diff) | |
| parent | 8c31c2006be7afa8da1fd01180955b108aee868c (diff) | |
| download | mruby-a096dc9e3b01f4fc31fc1f910e254813884a776e.tar.gz mruby-a096dc9e3b01f4fc31fc1f910e254813884a776e.zip | |
Merge remote-tracking branch 'mruby/master' into array-clear
Diffstat (limited to 'include')
| -rw-r--r-- | include/mruby.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/include/mruby.h b/include/mruby.h index 29cef451d..845443a1b 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -121,7 +121,10 @@ typedef struct mrb_state { size_t gc_threshold; int gc_interval_ratio; int gc_step_ratio; - int gc_disabled; + unsigned int gc_disabled:1; + unsigned int gc_full:1; + unsigned int is_generational_gc_mode:1; + size_t majorgc_old_threshold; struct alloca_header *mems; mrb_sym symidx; @@ -238,16 +241,6 @@ void mrb_write_barrier(mrb_state *, struct RBasic*); #define MRUBY_VERSION "Rite" -#ifdef DEBUG -#undef DEBUG -#endif - -#if 0 -#define DEBUG(x) x -#else -#define DEBUG(x) -#endif - mrb_value mrb_check_convert_type(mrb_state *mrb, mrb_value val, mrb_int type, const char *tname, const char *method); mrb_value mrb_any_to_s(mrb_state *mrb, mrb_value obj); const char * mrb_obj_classname(mrb_state *mrb, mrb_value obj); |