emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcpudp: define SO_ORIGINAL_DST directly, not via include

Browse Source 
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>
This commit is contained in:
Denys Vlasenko 2017-01-02 10:46:08 +01:00
parent 1f71014fd6
commit 7890035452
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
networking/tcpudp.c
View File

@ -107,10 +107,10 @@
#include "libbb.h" #include "libbb.h"
#include "common_bufsiz.h" #include "common_bufsiz.h"
/* Wants <limits.h> etc, thus included after libbb.h: */
#ifdef __linux__ #ifdef __linux__
#include <linux/types.h> /* for __be32 etc */ /* from linux/netfilter_ipv4.h: */
#include <linux/netfilter_ipv4.h> # undef SO_ORIGINAL_DST
# define SO_ORIGINAL_DST 80
#endif #endif
// TODO: move into this file: // TODO: move into this file: