Tarantool development patches archive
 help / color / mirror / Atom feed
From: Vladimir Davydov <vdavydov.dev@gmail.com>
To: Kirill Shcherbatov <kshcherbatov@tarantool.org>
Cc: tarantool-patches@freelists.org
Subject: Re: [PATCH v1 1/1] lib/bitset: rename bitset structs
Date: Tue, 3 Jul 2018 13:37:53 +0300	[thread overview]
Message-ID: <20180703103753.o3isk2wymm73ab6f@esperanza> (raw)
In-Reply-To: <ebcdfd94e9e51421141c05b8b4935631bc6ae8cb.1530613570.git.kshcherbatov@tarantool.org>

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).

  reply	other threads:[~2018-07-03 10:37 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-03 10:29 Kirill Shcherbatov
2018-07-03 10:37 ` Vladimir Davydov [this message]
2018-07-03 12:24   ` [tarantool-patches] " Kirill Shcherbatov
2018-07-03 12:52     ` Vladimir Davydov
2018-07-03 13:24       ` Kirill Shcherbatov
2018-07-03 16:25         ` Vladimir Davydov
2018-07-03 17:10           ` Konstantin Osipov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180703103753.o3isk2wymm73ab6f@esperanza \
    --to=vdavydov.dev@gmail.com \
    --cc=kshcherbatov@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='Re: [PATCH v1 1/1] lib/bitset: rename bitset structs' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox