Merge branch 'master' of git+ssh://gnunet.org/gnunet

2 files changed, 4 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;
 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
 
 
 /**