Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.busybox.net/busybox.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2017-01-02 12:46:08 +0300
committerDenys Vlasenko <vda.linux@googlemail.com>2017-01-10 18:55:51 +0300
commite94d2c5f242c793db1d76a4c0a63740de8ae6899 (patch)
treed1902b9e341b2ea6522c2e9737d8f6c6263d8fbf
parenta12eb9c64d736ffa8e335683f54b33b40fbc7385 (diff)
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>
-rw-r--r--networking/tcpudp.c6
1 files 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 <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: