void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev

Browse source
This commit is contained in:
Adam Ierymenko 2018-07-20 07:41:52 -07:00
commit 9bc11a369c
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
osdep/Binder.hpp
View file

@ -293,7 +293,7 @@ public:
#else #else
const bool gotViaProc = false; const bool gotViaProc = false;
#endif #endif
#if !defined(ZT_SDK) || !defined(__ANDROID__) // getifaddrs() freeifaddrs() not available on Android
if (!gotViaProc) { if (!gotViaProc) {
struct ifaddrs *ifatbl = (struct ifaddrs *)0; struct ifaddrs *ifatbl = (struct ifaddrs *)0;
struct ifaddrs *ifa; struct ifaddrs *ifa;
@ -325,6 +325,7 @@ public:
interfacesEnumerated = false; interfacesEnumerated = false;
} }
} }
#endif
#endif #endif
} else { } else {