From e94d2c5f242c793db1d76a4c0a63740de8ae6899 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 2 Jan 2017 10:46:08 +0100 Subject: [PATCH] tcpudp: define SO_ORIGINAL_DST directly, not via include musl does not like including linux/netfilter_ipv4.h (enum / #define collision in two headers, resulting in "3 = 3" type situation in enum definition). Signed-off-by: Denys Vlasenko --- networking/tcpudp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/networking/tcpudp.c b/networking/tcpudp.c index 94c89b9ef..3a6c68646 100644 --- a/networking/tcpudp.c +++ b/networking/tcpudp.c @@ -107,10 +107,10 @@ #include "libbb.h" #include "common_bufsiz.h" -/* Wants etc, thus included after libbb.h: */ #ifdef __linux__ -#include /* for __be32 etc */ -#include +/* from linux/netfilter_ipv4.h: */ +# undef SO_ORIGINAL_DST +# define SO_ORIGINAL_DST 80 #endif // TODO: move into this file: -- 2.25.1