]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: tcp: do not include netinet/ip.h for IP_TTL
authorWilly Tarreau <w@1wt.eu>
Wed, 10 Aug 2016 16:42:17 +0000 (18:42 +0200)
committerWilly Tarreau <w@1wt.eu>
Wed, 10 Aug 2016 17:32:15 +0000 (19:32 +0200)
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.

src/proto_tcp.c

index f7610dfb288119c78c5721574151e8086f84db20..797ddcbb4086eb1e553cb3b2c7932a4c4b90e582 100644 (file)
@@ -31,7 +31,6 @@
 
 #include <netinet/tcp.h>
 #include <netinet/in.h>
-#include <netinet/ip.h>
 
 #include <common/cfgparse.h>
 #include <common/compat.h>