Merge pull request #1606 from teslamint/patch-2
coova-chilli: fix compile error with musl
This commit is contained in:
commit
82b9e65ff0
1 changed files with 61 additions and 0 deletions
61
net/coova-chilli/patches/400-fix-compile-with-musl.patch
Normal file
61
net/coova-chilli/patches/400-fix-compile-with-musl.patch
Normal file
|
@ -0,0 +1,61 @@
|
|||
--- a/src/system.h
|
||||
+++ b/src/system.h
|
||||
@@ -78,11 +78,6 @@
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
-#ifdef HAVE_LINUX_SYSINFO_H
|
||||
-#define _LINUX_KERNEL_H
|
||||
-#include <linux/sysinfo.h>
|
||||
-#endif
|
||||
-
|
||||
#ifdef HAVE_TIME_H
|
||||
#include <time.h>
|
||||
#endif
|
||||
@@ -123,6 +118,11 @@
|
||||
#include <signal.h>
|
||||
#endif
|
||||
|
||||
+#ifdef HAVE_SYS_SYSINFO_H
|
||||
+#define _LINUX_SYSINFO_H
|
||||
+#include <sys/sysinfo.h>
|
||||
+#endif
|
||||
+
|
||||
#if defined(__linux__)
|
||||
#include <asm/types.h>
|
||||
#include <linux/if.h>
|
||||
@@ -135,10 +135,6 @@
|
||||
#include <linux/un.h>
|
||||
#endif
|
||||
|
||||
-#ifdef HAVE_SYS_SYSINFO_H
|
||||
-#include <sys/sysinfo.h>
|
||||
-#endif
|
||||
-
|
||||
#elif defined (__FreeBSD__) || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__)
|
||||
#include <net/if.h>
|
||||
#include <net/bpf.h>
|
||||
@@ -170,10 +166,6 @@
|
||||
#include <net/if_tun.h>
|
||||
#endif
|
||||
|
||||
-#ifdef HAVE_NET_ETHERNET_H
|
||||
-#include <net/ethernet.h>
|
||||
-#endif
|
||||
-
|
||||
#ifdef HAVE_ASM_TYPES_H
|
||||
#include <asm/types.h>
|
||||
#endif
|
||||
--- a/src/chilli_limits.h
|
||||
+++ b/src/chilli_limits.h
|
||||
@@ -18,8 +18,8 @@
|
||||
*
|
||||
*/
|
||||
|
||||
-#ifndef _LIMITS_H
|
||||
-#define _LIMITS_H
|
||||
+#ifndef _CHILLI_LIMITS_H
|
||||
+#define _CHILLI_LIMITS_H
|
||||
|
||||
/*
|
||||
* extracted from various .h files, needs some cleanup.
|
Loading…
Reference in a new issue