summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenys Vlasenko2017-01-02 10:46:08 +0100
committerDenys Vlasenko2017-01-02 10:46:08 +0100
commit78900354524ee966ee6b5299c87831fcccf1deb0 (patch)
treeaa56f36b18fa40b5c603f0074ec213d5df90002c /networking
parent1f71014fd6de609ea8947fcb77d03d16fe18c841 (diff)
downloadbusybox-78900354524ee966ee6b5299c87831fcccf1deb0.zip
busybox-78900354524ee966ee6b5299c87831fcccf1deb0.tar.gz
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>
Diffstat (limited to 'networking')
-rw-r--r--networking/tcpudp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index 94c89b9..3a6c686 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: