tcpudp: define SO_ORIGINAL_DST directly, not via include
authorDenys Vlasenko <vda.linux@googlemail.com>
Mon, 2 Jan 2017 09:46:08 +0000 (10:46 +0100)
committerDenys Vlasenko <vda.linux@googlemail.com>
Tue, 10 Jan 2017 15:55:51 +0000 (16:55 +0100)
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>
networking/tcpudp.c

index 94c89b9ef9c2c1099f6467cfa9555748b4e20467..3a6c68646d592477481d6aad9b69a73c38be2a87 100644 (file)
 #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: