diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-07-24 23:22:58 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-07-24 23:22:58 +0900 |
| commit | 875c07a742e87208a60ce465993f7aef39c007d1 (patch) | |
| tree | e0aecd78945371e20f6004a6fac39abf0cff80e8 /src | |
| parent | 6055ebaf782691f226517700cdc87a2536c0cca8 (diff) | |
| parent | fc9a91c4a69532d22dc12775c28c5a32d9935f4b (diff) | |
| download | mruby-875c07a742e87208a60ce465993f7aef39c007d1.tar.gz mruby-875c07a742e87208a60ce465993f7aef39c007d1.zip | |
Merge pull request #2477 from take-cheeze/allocf_ud
Add field `allocf_ud` to replace current `ud`.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gc.c | 6 | ||||
| -rw-r--r-- | src/state.c | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -173,10 +173,10 @@ mrb_realloc_simple(mrb_state *mrb, void *p, size_t len) { void *p2; - p2 = (mrb->allocf)(mrb, p, len, mrb->ud); + p2 = (mrb->allocf)(mrb, p, len, mrb->allocf_ud); if (!p2 && len > 0 && mrb->heaps) { mrb_full_gc(mrb); - p2 = (mrb->allocf)(mrb, p, len, mrb->ud); + p2 = (mrb->allocf)(mrb, p, len, mrb->allocf_ud); } return p2; @@ -242,7 +242,7 @@ mrb_calloc(mrb_state *mrb, size_t nelem, size_t len) void mrb_free(mrb_state *mrb, void *p) { - (mrb->allocf)(mrb, p, 0, mrb->ud); + (mrb->allocf)(mrb, p, 0, mrb->allocf_ud); } #ifndef MRB_HEAP_PAGE_SIZE diff --git a/src/state.c b/src/state.c index 69ac95968..9c40c842c 100644 --- a/src/state.c +++ b/src/state.c @@ -33,7 +33,7 @@ mrb_open_core(mrb_allocf f, void *ud) if (mrb == NULL) return NULL; *mrb = mrb_state_zero; - mrb->ud = ud; + mrb->allocf_ud = ud; mrb->allocf = f; mrb->current_white_part = MRB_GC_WHITE_A; mrb->atexit_stack_len = 0; |
