diff options
| author | Paolo Bosetti <[email protected]> | 2012-08-13 16:26:15 +0200 |
|---|---|---|
| committer | Paolo Bosetti <[email protected]> | 2012-08-13 16:26:15 +0200 |
| commit | 4c56ce2744f4c8640de1b299c4ff4bd749a93345 (patch) | |
| tree | 1286395880c71cd30e0938b020cd154c3317357c /include/mruby.h | |
| parent | 05127776cf0c528b549d723ba2e325332e49ced9 (diff) | |
| parent | cda1709a35ad7d495ec1a08793cd88b78e20c444 (diff) | |
| download | mruby-4c56ce2744f4c8640de1b299c4ff4bd749a93345.tar.gz mruby-4c56ce2744f4c8640de1b299c4ff4bd749a93345.zip | |
Merge branch 'master' into XCode
Diffstat (limited to 'include/mruby.h')
| -rw-r--r-- | include/mruby.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/mruby.h b/include/mruby.h index 451b4eb8b..380c5f24c 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -233,11 +233,12 @@ typedef struct mrb_state { int esize; struct RObject *exc; - struct kh_iv *globals; + struct iv_tbl *globals; struct mrb_irep **irep; size_t irep_len, irep_capa; + mrb_sym init_sym; struct RClass *object_class; struct RClass *class_class; struct RClass *module_class; @@ -267,8 +268,9 @@ typedef struct mrb_state { struct RBasic *variable_gray_list; /* list of objects to be traversed atomically */ size_t gc_live_after_mark; size_t gc_threshold; - mrb_int gc_interval_ratio; - mrb_int gc_step_ratio; + int gc_interval_ratio; + int gc_step_ratio; + int gc_disabled; mrb_sym symidx; struct kh_n2s *name2sym; /* symbol table */ |