From: Willy Tarreau <w@1wt.eu>
Date: Wed, 10 Aug 2016 16:42:17 +0000 (+0200)
Subject: BUILD: tcp: do not include netinet/ip.h for IP_TTL
X-Git-Tag: v1.7-dev4~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f3e3c0159401cdf47575bc82304696b3a98a2ab;p=thirdparty%2Fhaproxy.git

BUILD: tcp: do not include netinet/ip.h for IP_TTL

On OpenBSD, netinet/ip.h fails unless in_systm.h is included. This
include was added by the silent-drop feature introduced with commit
2d392c2 ("MEDIUM: tcp: add new tcp action "silent-drop"") in 1.6-dev6,
but we don't need it, IP_TTL is defined in netinet/in.h, so let's drop
this useless include.

This fix needs to be backported to 1.6.
---

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index f7610dfb28..797ddcbb40 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -31,7 +31,6 @@
 
 #include <netinet/tcp.h>
 #include <netinet/in.h>
-#include <netinet/ip.h>
 
 #include <common/cfgparse.h>
 #include <common/compat.h>