diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-05-26 19:17:29 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-05-26 19:17:29 -0700 |
| commit | 703c311e0729e170f48d00e23b7dce117700650d (patch) | |
| tree | 4416a4acbcbcf1bf3d169c48466a122ef47a757e /service | |
| parent | 6e998efd15d0c0c85b8b605d84518cb7197a9086 (diff) | |
| parent | e184aa4cb43151690959d895cba7d1f1bbc036fa (diff) | |
| download | infinitytier-703c311e0729e170f48d00e23b7dce117700650d.tar.gz infinitytier-703c311e0729e170f48d00e23b7dce117700650d.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'service')
| -rw-r--r-- | service/OneService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/service/OneService.cpp b/service/OneService.cpp index 9a72c240..9a024c2c 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -95,7 +95,7 @@ namespace ZeroTier { typedef LinuxEthernetTap EthernetTap; } #include "../osdep/WindowsEthernetTap.hpp" namespace ZeroTier { typedef WindowsEthernetTap EthernetTap; } #endif -#if defined(__BSD__) && (!defined(__APPLE__)) +#ifdef __FreeBSD__ #include "../osdep/BSDEthernetTap.hpp" namespace ZeroTier { typedef BSDEthernetTap EthernetTap; } #endif |