From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 589E52E06D for ; Wed, 5 Jun 2019 07:24:10 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Lh-Z1wmrOPbh for ; Wed, 5 Jun 2019 07:24:10 -0400 (EDT) Received: from smtp29.i.mail.ru (smtp29.i.mail.ru [94.100.177.89]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id A71972D9E0 for ; Wed, 5 Jun 2019 07:24:09 -0400 (EDT) Date: Wed, 5 Jun 2019 14:23:47 +0300 From: Alexander Turenko Subject: [tarantool-patches] Re: [PATCH v1] Fix FreeBSD build Message-ID: <20190605112345.n4j2uaj4wvnmh7ru@tkn_work_nb> References: <8e92c204103404ba588c2402da378d12e8eff68d.1559300665.git.avtikhon@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <8e92c204103404ba588c2402da378d12e8eff68d.1559300665.git.avtikhon@tarantool.org> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: "Alexander V. Tikhonov" Cc: tarantool-patches@freelists.org, Vladislav Shpilevoy CCed Vlad. On Fri, May 31, 2019 at 02:07:06PM +0300, Alexander V. Tikhonov wrote: > Fixed swim headers in addition to commits: > 88892f13a3934c72721e6240bfa5fe174d62d99b Please, add a commit header too, like 0000000000000000000000000000000000000000 ('commit header here'). > > Closes #4050 > --- > > Travis-ci: https://travis-ci.org/tarantool/tarantool/builds/539652447 > Issue: https://github.com/tarantool/tarantool/issues/4050 > > src/lib/swim/swim_proto.h | 3 ++- > src/lib/swim/swim_transport.h | 4 ++++ > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/src/lib/swim/swim_proto.h b/src/lib/swim/swim_proto.h > index 482d79fb1..5275d4e7e 100644 > --- a/src/lib/swim/swim_proto.h > +++ b/src/lib/swim/swim_proto.h > @@ -33,8 +33,9 @@ > #include "tt_static.h" > #include "uuid/tt_uuid.h" > #include > -#include > #include > +#include > +#include > #include > #include "swim_constants.h" I guess here the problem only in , so please check where it is really defined and leave only needed header. Also I suggest to mark #include directive in the following way: #include /* struct foo */ > > diff --git a/src/lib/swim/swim_transport.h b/src/lib/swim/swim_transport.h > index c4e48cdeb..137c73212 100644 > --- a/src/lib/swim/swim_transport.h > +++ b/src/lib/swim/swim_transport.h > @@ -32,6 +32,10 @@ > */ > #include > #include > +#include > +#include > +#include > +#include Are we really need all those headers for ? I would declare as we do for , because we don't need to know a size of the structure (it only used by a pointer). So, add ``` struct sockaddr; ``` And check where is defined on FreeBSD and add only this specific header. If there are problems in the corresponding C file, let's fix them in the C file. > > struct ifaddrs; > > -- > 2.17.1 >