diff options
Diffstat (limited to 'main/coova-chilli/system.patch')
| -rw-r--r-- | main/coova-chilli/system.patch | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/main/coova-chilli/system.patch b/main/coova-chilli/system.patch index b5958f7279..17d3ba3bb7 100644 --- a/main/coova-chilli/system.patch +++ b/main/coova-chilli/system.patch @@ -1,7 +1,9 @@ ---- ./src/system.h.orig 2014-05-01 13:22:35.122472244 -0200 -+++ ./src/system.h 2014-05-01 13:23:19.896392972 -0200 -@@ -121,18 +121,6 @@ - #include <signal.h> +diff --git a/src/system.h b/src/system.h +index 6ddf98c..3efef6a 100644 +--- a/src/system.h ++++ b/src/system.h +@@ -117,27 +117,6 @@ + #include <inttypes.h> #endif -#if defined(__linux__) @@ -16,10 +18,19 @@ -#include <linux/un.h> -#endif - - #elif defined (__FreeBSD__) || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__) +-#ifdef HAVE_SYS_SYSINFO_H +-#include <sys/sysinfo.h> +-#else +-#ifdef HAVE_LINUX_SYSINFO_H +-#define _LINUX_KERNEL_H +-#include <linux/sysinfo.h> +-#endif +-#endif +- + #elif defined (__FreeBSD__) || defined (__APPLE__) || defined (__OpenBSD__) || defined (__NetBSD__) #include <net/if.h> #include <net/bpf.h> -@@ -256,6 +244,18 @@ +@@ -244,6 +223,27 @@ #include <unistd.h> #include <errno.h> @@ -35,6 +46,15 @@ +#include <linux/un.h> +#endif + - #define safe_snprintf portable_snprintf - char *safe_strncpy(char *dst, const char *src, size_t size); - ++#ifdef HAVE_SYS_SYSINFO_H ++#include <sys/sysinfo.h> ++#else ++#ifdef HAVE_LINUX_SYSINFO_H ++#define _LINUX_KERNEL_H ++#include <linux/sysinfo.h> ++#endif ++#endif ++ + int safe_accept(int fd, struct sockaddr *sa, socklen_t *lenptr); + int safe_select(int nfds, fd_set *readfds, fd_set *writefds, + fd_set *exceptfds, struct timeval *timeout); |