diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-02 10:46:08 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-10 16:55:51 +0100 |
| commit | e94d2c5f242c793db1d76a4c0a63740de8ae6899 (patch) | |
| tree | d1902b9e341b2ea6522c2e9737d8f6c6263d8fbf | |
| parent | a12eb9c64d736ffa8e335683f54b33b40fbc7385 (diff) | |
| download | busybox-w32-e94d2c5f242c793db1d76a4c0a63740de8ae6899.tar.gz busybox-w32-e94d2c5f242c793db1d76a4c0a63740de8ae6899.tar.bz2 busybox-w32-e94d2c5f242c793db1d76a4c0a63740de8ae6899.zip | |
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.c | 6 |
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 @@ | |||
| 107 | #include "libbb.h" | 107 | #include "libbb.h" |
| 108 | #include "common_bufsiz.h" | 108 | #include "common_bufsiz.h" |
| 109 | 109 | ||
| 110 | /* Wants <limits.h> etc, thus included after libbb.h: */ | ||
| 111 | #ifdef __linux__ | 110 | #ifdef __linux__ |
| 112 | #include <linux/types.h> /* for __be32 etc */ | 111 | /* from linux/netfilter_ipv4.h: */ |
| 113 | #include <linux/netfilter_ipv4.h> | 112 | # undef SO_ORIGINAL_DST |
| 113 | # define SO_ORIGINAL_DST 80 | ||
| 114 | #endif | 114 | #endif |
| 115 | 115 | ||
| 116 | // TODO: move into this file: | 116 | // TODO: move into this file: |