summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authortake_cheeze <[email protected]>2014-07-17 21:48:17 +0900
committertake_cheeze <[email protected]>2014-07-17 21:48:17 +0900
commitfc9a91c4a69532d22dc12775c28c5a32d9935f4b (patch)
tree34261c42de1e0b7777b32bb76fd8c55c29e82152 /src
parentd17506c176ef6d1ac70e84664790cdb1cb2cf3de (diff)
downloadmruby-fc9a91c4a69532d22dc12775c28c5a32d9935f4b.tar.gz
mruby-fc9a91c4a69532d22dc12775c28c5a32d9935f4b.zip
Add field `allocf_ud` to replace current `ud`.
Since some use it as `mrb_state` associated user data.
Diffstat (limited to 'src')
-rw-r--r--src/gc.c6
-rw-r--r--src/state.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gc.c b/src/gc.c
index 8e982de6d..84dee4958 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -171,10 +171,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;
@@ -240,7 +240,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 ff0182f22..bd6e7e553 100644
--- a/src/state.c
+++ b/src/state.c
@@ -37,7 +37,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;