[PATCH v1 1/1] lib/bitset: rename bitset structs
Vladimir Davydov
vdavydov.dev at gmail.com
Tue Jul 3 13:37:53 MSK 2018
On Tue, Jul 03, 2018 at 01:29:00PM +0300, Kirill Shcherbatov wrote:
> Fixed FreeBSD build: there were conflicting types bitset
> declared in lib/bitset and _cpuset.h that is the part of
> pthread_np.h used on FreeBSD.
>
> Resolves #3046.
> ---
> https://github.com/tarantool/tarantool/tree/kshch/gh-3046-freebsd-build
> https://github.com/tarantool/tarantool/issues/3046
>
> src/lib/bitset/bitset.c | 43 ++++++++++++++++++++++---------------------
> src/lib/bitset/bitset.h | 27 ++++++++++++++-------------
> src/lib/bitset/index.c | 4 ++--
> src/lib/bitset/index.h | 2 +-
> src/lib/bitset/iterator.c | 14 +++++++-------
> src/lib/bitset/iterator.h | 6 +++---
> src/lib/bitset/page.c | 22 +++++++++++-----------
> src/lib/bitset/page.h | 29 +++++++++++++++--------------
> test/unit/bitset_basic.c | 4 ++--
> test/unit/bitset_iterator.c | 24 ++++++++++++------------
> 10 files changed, 89 insertions(+), 86 deletions(-)
>
> diff --git a/src/lib/bitset/bitset.c b/src/lib/bitset/bitset.c
> index ae2a033..953684b 100644
> --- a/src/lib/bitset/bitset.c
> +++ b/src/lib/bitset/bitset.c
> @@ -37,7 +37,7 @@
> #include <assert.h>
>
> void
> -bitset_create(struct bitset *bitset, void *(*realloc)(void *ptr, size_t size))
> +bitset_create(struct tt_bitset *bitset, void *(*realloc)(void *ptr, size_t size))
> {
> memset(bitset, 0, sizeof(*bitset));
> bitset->realloc = realloc;
If you're renaming struct bitset to struct tt_bitset, you should also
rename all its methods (bitset_create => tt_bitset_create and so forth).
More information about the Tarantool-patches
mailing list