diff options
author | nikita <nikita@n0.is> | 2020-05-01 10:55:51 +0200 |
---|---|---|
committer | nikita <nikita@n0.is> | 2020-05-01 10:55:51 +0200 |
commit | 91e407579c48f62df4c75c49f63937009f563099 (patch) | |
tree | 692d17da41a0c0a119ac96afd6abec958db1b598 /src/exit | |
parent | d3ec11c5a2dc7521efbd308e273dccc26c0e4bb4 (diff) | |
download | gnunet-91e407579c48f62df4c75c49f63937009f563099.tar.gz gnunet-91e407579c48f62df4c75c49f63937009f563099.zip |
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
Diffstat (limited to 'src/exit')
-rw-r--r-- | src/exit/gnunet-helper-exit.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; | |||
85 | static const char *sbin_iptables; | 85 | static const char *sbin_iptables; |
86 | 86 | ||
87 | 87 | ||
88 | #if ! defined(__ANDROID__) | ||
88 | #if ! defined(_LINUX_IN6_H) && defined(__linux__) | 89 | #if ! defined(_LINUX_IN6_H) && defined(__linux__) |
89 | /** | 90 | /** |
90 | * This is in linux/include/net/ipv6.h, but not always exported. | 91 | * This is in linux/include/net/ipv6.h, but not always exported. |
@@ -96,6 +97,7 @@ struct in6_ifreq | |||
96 | int ifr6_ifindex; | 97 | int ifr6_ifindex; |
97 | }; | 98 | }; |
98 | #endif | 99 | #endif |
100 | #endif | ||
99 | 101 | ||
100 | 102 | ||
101 | /** | 103 | /** |