Merge branch 'generalize-alloc-via-ok_freelist'
authorIvan Maidanski <ivmai@mail.ru>
Thu, 30 Jun 2016 07:50:59 +0000 (10:50 +0300)
committerIvan Maidanski <ivmai@mail.ru>
Thu, 30 Jun 2016 07:59:22 +0000 (10:59 +0300)
commitfe6e67c9554c57457687b056ba0fac565b7ff68e
tree59370b5da4a0e0af13a34d4899358d088fd0197f
parentd32cb53bb0b32a44ae9c68cfe22876a9c069b957
parent9cd4c2f2d3bf68a98210024dfd573c8b50ff41d6
Merge branch 'generalize-alloc-via-ok_freelist'

* mark.c (GC_n_kinds): Resolve merge conflict.
include/private/gc_priv.h
malloc.c
mallocx.c
mark.c
misc.c