diff options
author | Sverker Eriksson <[email protected]> | 2016-11-22 14:57:39 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2016-11-22 14:57:39 +0100 |
commit | 0e2bde208e45bb24ae3d9fcd3db94b93882ecaec (patch) | |
tree | a6334828227fda954756453474429335aca89cd9 /erts/emulator/beam/erl_ao_firstfit_alloc.c | |
parent | 9563cd5b296fe589c8abe357710fbb79bc766d09 (diff) | |
parent | b62020124b3294be021d0d62073ba34cda1ae742 (diff) | |
download | otp-0e2bde208e45bb24ae3d9fcd3db94b93882ecaec.tar.gz otp-0e2bde208e45bb24ae3d9fcd3db94b93882ecaec.tar.bz2 otp-0e2bde208e45bb24ae3d9fcd3db94b93882ecaec.zip |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_ao_firstfit_alloc.c')
-rw-r--r-- | erts/emulator/beam/erl_ao_firstfit_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_ao_firstfit_alloc.c b/erts/emulator/beam/erl_ao_firstfit_alloc.c index 7e239d1f5d..05ba1f9891 100644 --- a/erts/emulator/beam/erl_ao_firstfit_alloc.c +++ b/erts/emulator/beam/erl_ao_firstfit_alloc.c @@ -224,7 +224,7 @@ static AOFF_RBTree_t* rbt_search(AOFF_RBTree_t* root, Uint size); static int rbt_assert_is_member(AOFF_RBTree_t* root, AOFF_RBTree_t* node); #endif -static Eterm info_options(Allctr_t *, char *, int *, void *, Uint **, Uint *); +static Eterm info_options(Allctr_t *, char *, fmtfn_t *, void *, Uint **, Uint *); static void init_atoms(void); @@ -1014,7 +1014,7 @@ add_2tup(Uint **hpp, Uint *szp, Eterm *lp, Eterm el1, Eterm el2) static Eterm info_options(Allctr_t *allctr, char *prefix, - int *print_to_p, + fmtfn_t *print_to_p, void *print_to_arg, Uint **hpp, Uint *szp) |