400-fix-compile-with-musl.patch (1117B)
1 --- a/src/system.h 2 +++ b/src/system.h 3 @@ -78,11 +78,6 @@ 4 #include <sys/stat.h> 5 #endif 6 7 -#ifdef HAVE_LINUX_SYSINFO_H 8 -#define _LINUX_KERNEL_H 9 -#include <linux/sysinfo.h> 10 -#endif 11 - 12 #ifdef HAVE_TIME_H 13 #include <time.h> 14 #endif 15 @@ -123,6 +118,11 @@ 16 #include <signal.h> 17 #endif 18 19 +#ifdef HAVE_SYS_SYSINFO_H 20 +#define _LINUX_SYSINFO_H 21 +#include <sys/sysinfo.h> 22 +#endif 23 + 24 #if defined(__linux__) 25 #include <asm/types.h> 26 #include <linux/if.h> 27 @@ -135,10 +135,6 @@ 28 #include <linux/un.h> 29 #endif 30 31 -#ifdef HAVE_SYS_SYSINFO_H 32 -#include <sys/sysinfo.h> 33 -#endif 34 - 35 #elif defined (__FreeBSD__) || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__) 36 #include <net/if.h> 37 #include <net/bpf.h> 38 @@ -170,10 +166,6 @@ 39 #include <net/if_tun.h> 40 #endif 41 42 -#ifdef HAVE_NET_ETHERNET_H 43 -#include <net/ethernet.h> 44 -#endif 45 - 46 #ifdef HAVE_ASM_TYPES_H 47 #include <asm/types.h> 48 #endif 49 --- a/src/chilli_limits.h 50 +++ b/src/chilli_limits.h 51 @@ -18,8 +18,8 @@ 52 * 53 */ 54 55 -#ifndef _LIMITS_H 56 -#define _LIMITS_H 57 +#ifndef _CHILLI_LIMITS_H 58 +#define _CHILLI_LIMITS_H 59 60 /* 61 * extracted from various .h files, needs some cleanup.