From 91e407579c48f62df4c75c49f63937009f563099 Mon Sep 17 00:00:00 2001 From: nikita Date: Fri, 1 May 2020 10:55:51 +0200 Subject: [PATCH] vpn, exit: Add patch from termux for Android in a slightly different way. Arguable 1st one could just be || and second one be kept as-is. https://github.com/termux/termux-packages/blob/master/packages/gnunet/no-in6_ifreq-redef.patch --- src/exit/gnunet-helper-exit.c | 2 ++ src/vpn/gnunet-helper-vpn.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/exit/gnunet-helper-exit.c b/src/exit/gnunet-helper-exit.c index d46032662..4a6c66deb 100644 --- a/src/exit/gnunet-helper-exit.c +++ b/src/exit/gnunet-helper-exit.c @@ -85,6 +85,7 @@ static const char *sbin_sysctl; static const char *sbin_iptables; +#if ! defined(__ANDROID__) #if ! defined(_LINUX_IN6_H) && defined(__linux__) /** * This is in linux/include/net/ipv6.h, but not always exported. @@ -96,6 +97,7 @@ struct in6_ifreq int ifr6_ifindex; }; #endif +#endif /** diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c index 4e35fa2c3..c693d24ea 100644 --- a/src/vpn/gnunet-helper-vpn.c +++ b/src/vpn/gnunet-helper-vpn.c @@ -59,6 +59,7 @@ */ #define MAX_SIZE 65536 +#if ! defined(__ANDROID__) #ifndef _LINUX_IN6_H /** * This is in linux/include/net/ipv6.h, but not always exported... @@ -70,6 +71,7 @@ struct in6_ifreq unsigned int ifr6_ifindex; }; #endif +#endif /** -- 2.25.1