From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 2 Jan 2017 09:46:08 +0000 (+0100)
Subject: tcpudp: define SO_ORIGINAL_DST directly, not via include
X-Git-Tag: 1_26_2~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e94d2c5f242c793db1d76a4c0a63740de8ae6899;p=oweals%2Fbusybox.git

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 <vda.linux@googlemail.com>
---

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 <limits.h> etc, thus included after libbb.h: */
 #ifdef __linux__
-#include <linux/types.h> /* for __be32 etc */
-#include <linux/netfilter_ipv4.h>
+/* from linux/netfilter_ipv4.h: */
+# undef  SO_ORIGINAL_DST
+# define SO_ORIGINAL_DST 80
 #endif
 
 // TODO: move into this file: