* [tarantool-patches] [PATCH v1] Fix FreeBSD build
@ 2019-05-31 7:58 Alexander V. Tikhonov
0 siblings, 0 replies; 3+ messages in thread
From: Alexander V. Tikhonov @ 2019-05-31 7:58 UTC (permalink / raw)
To: Alexander Turenko; +Cc: Alexander V. Tikhonov, tarantool-patches
Fixed swim headers in addition to commit
Closes #4050
---
Travis-ci: https://travis-ci.org/tarantool/tarantool/jobs/539576716
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..f0276911b 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 <sys/socket.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <unistd.h>
struct ifaddrs;
--
2.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [tarantool-patches] [PATCH v1] Fix FreeBSD build
2019-05-31 11:07 Alexander V. Tikhonov
@ 2019-05-31 11:20 ` Vladimir Davydov
0 siblings, 0 replies; 3+ messages in thread
From: Vladimir Davydov @ 2019-05-31 11:20 UTC (permalink / raw)
To: Alexander V. Tikhonov; +Cc: Alexander Turenko, tarantool-patches
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?
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tarantool-patches] [PATCH v1] Fix FreeBSD build
@ 2019-05-31 11:07 Alexander V. Tikhonov
2019-05-31 11:20 ` Vladimir Davydov
0 siblings, 1 reply; 3+ messages in thread
From: Alexander V. Tikhonov @ 2019-05-31 11:07 UTC (permalink / raw)
To: Alexander Turenko; +Cc: Alexander V. Tikhonov, tarantool-patches
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;
--
2.17.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-05-31 11:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-31 7:58 [tarantool-patches] [PATCH v1] Fix FreeBSD build Alexander V. Tikhonov
2019-05-31 11:07 Alexander V. Tikhonov
2019-05-31 11:20 ` Vladimir Davydov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox