Tarantool development patches archive
 help / color / mirror / Atom feed
From: Vladimir Davydov <vdavydov.dev@gmail.com>
To: "Alexander V. Tikhonov" <avtikhon@tarantool.org>
Cc: Alexander Turenko <alexander.turenko@tarantool.org>,
	tarantool-patches@freelists.org
Subject: Re: [tarantool-patches] [PATCH v1] Fix FreeBSD build
Date: Fri, 31 May 2019 14:20:49 +0300	[thread overview]
Message-ID: <20190531112049.36ficqlcbceftua4@esperanza> (raw)
In-Reply-To: <8e92c204103404ba588c2402da378d12e8eff68d.1559300665.git.avtikhon@tarantool.org>

On Fri, May 31, 2019 at 02:07:06PM +0300, Alexander V. Tikhonov wrote:
> Fixed swim headers in addition to commits:
> 88892f13a3934c72721e6240bfa5fe174d62d99b
> 
> 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 <arpa/inet.h>
> -#include <netinet/in.h>
>  #include <sys/socket.h>
> +#include <netinet/in.h>
> +#include <netinet/ip.h>
>  #include <stdbool.h>
>  #include "swim_constants.h"
>  
> 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 <netinet/in.h>
>  #include <arpa/inet.h>
> +#include <unistd.h>
> +#include <sys/socket.h>
> +#include <netinet/in.h>
> +#include <netinet/ip.h>
>  
>  struct ifaddrs;
>  

You've just pushed and immediately reverted it. What's going on?

  reply	other threads:[~2019-05-31 11:20 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-31 11:07 Alexander V. Tikhonov
2019-05-31 11:20 ` Vladimir Davydov [this message]
2019-05-31 12:42   ` Re[2]: " Alexander Tikhonov
2019-06-05 11:23 ` [tarantool-patches] " Alexander Turenko
  -- strict thread matches above, loose matches on Subject: below --
2019-05-31  7:58 [tarantool-patches] " Alexander V. Tikhonov

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=20190531112049.36ficqlcbceftua4@esperanza \
    --to=vdavydov.dev@gmail.com \
    --cc=alexander.turenko@tarantool.org \
    --cc=avtikhon@tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --subject='Re: [tarantool-patches] [PATCH v1] Fix FreeBSD build' \
    /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