summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gc.c8
-rw-r--r--lib.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/gc.c b/gc.c
index 45106d8b..41f0c6d2 100644
--- a/gc.c
+++ b/gc.c
@@ -1323,11 +1323,11 @@ static struct cobj_ops prot_array_ops = cobj_ops_init(eq,
val *gc_prot_array_alloc(cnum size)
{
- struct prot_array *pa = convert(struct prot_array *,
- chk_calloc(offsetof(struct prot_array, arr) +
- size * sizeof(val), 1));
+ struct prot_array *pa = coerce(struct prot_array *,
+ chk_calloc(offsetof(struct prot_array, arr) +
+ size * sizeof(val), 1));
pa->size = size;
- pa->self = cobj(convert(mem_t *, pa), prot_array_cls, &prot_array_ops);
+ pa->self = cobj(coerce(mem_t *, pa), prot_array_cls, &prot_array_ops);
return pa->arr;
}
diff --git a/lib.h b/lib.h
index dc90aa23..8448db55 100644
--- a/lib.h
+++ b/lib.h
@@ -47,8 +47,8 @@ typedef double_uintptr_t dbl_ucnum;
#endif
#define container(PTR, TYPE, MEMB) \
- convert(TYPE *, \
- convert(mem_t *, (PTR)) - offsetof(TYPE, MEMB))
+ coerce(TYPE *, \
+ coerce(mem_t *, (PTR)) - offsetof(TYPE, MEMB))
#if __STDC_VERSION__ >= 199901L
#define FLEX_ARRAY