From 39cf063480f6a378dadc802c174e96112c38c0c0 Mon Sep 17 00:00:00 2001 From: Roman Perepelitsa Date: Tue, 24 Nov 2020 12:32:19 +0100 Subject: Squashed 'gitstatus/' changes from 90cbb46b..ae213c54 ae213c54 add "pkg" target to makefile a208375b comments cdeb063d Give ListDir() the same semantics on BSD as on Linux git-subtree-dir: gitstatus git-subtree-split: ae213c540dd6924d3fb153a0860276897c9ba6c8 --- src/arena.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/arena.h') diff --git a/src/arena.h b/src/arena.h index 0bad0bfa..569833ca 100644 --- a/src/arena.h +++ b/src/arena.h @@ -37,7 +37,7 @@ namespace gitstatus { // // // Donates a block to the arena. When the time comes, it'll be freed with // // free(p, size, userdata). -// void Donate(void* p, size_t size, void* userdata, void(*free)(void*, void*)); +// void Donate(void* p, size_t size, void* userdata, void(*free)(void*, size_t, void*)); class Arena { public: struct Options { @@ -62,7 +62,7 @@ class Arena { // // void* userdata; // void (*alloc)(size_t size, size_t alignment, void* userdata); - // void (*free)(size_t size, void* userdata); + // void (*free)(void* p, size_t size, void* userdata); }; // Requires: opt.min_block_size <= opt.max_block_size. -- cgit v1.2.3