diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-07-20 07:41:52 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2018-07-20 07:41:52 -0700 |
| commit | 9bc11a369ca9ede9649103215fd0d491af4a8077 (patch) | |
| tree | 19d331a27161ee9195b01fe968262cccde96acea /osdep | |
| parent | ac40f2191caa638603d51bd776f14cfd68abf2c6 (diff) | |
| parent | 62a93c58fda12c4539bc2f5e0efbeca8ec8d530d (diff) | |
| download | infinitytier-9bc11a369ca9ede9649103215fd0d491af4a8077.tar.gz infinitytier-9bc11a369ca9ede9649103215fd0d491af4a8077.zip | |
Merge branch 'dev' of http://10.6.6.2/zerotier/ZeroTierOne into dev
Diffstat (limited to 'osdep')
| -rw-r--r-- | osdep/Binder.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/osdep/Binder.hpp b/osdep/Binder.hpp index 93fad9f1..691e5281 100644 --- a/osdep/Binder.hpp +++ b/osdep/Binder.hpp @@ -293,7 +293,7 @@ public: #else const bool gotViaProc = false; #endif - +#if !defined(ZT_SDK) || !defined(__ANDROID__) // getifaddrs() freeifaddrs() not available on Android if (!gotViaProc) { struct ifaddrs *ifatbl = (struct ifaddrs *)0; struct ifaddrs *ifa; @@ -325,6 +325,7 @@ public: interfacesEnumerated = false; } } +#endif #endif } else { |