From d0e0f5dd126d37a27a43cc00ed351ed1289c203c Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 15 May 2015 08:48:53 -0700 Subject: Basic OpenBSD compile fixes -- still need to update BSDEthernetTap, will do that later. Should be able to re-use FreeBSD port for OpenBSD, but we will see. --- service/OneService.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'service/OneService.cpp') diff --git a/service/OneService.cpp b/service/OneService.cpp index 56b1d979..dd919474 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -70,6 +70,10 @@ namespace ZeroTier { typedef LinuxEthernetTap EthernetTap; } #include "../osdep/WindowsEthernetTap.hpp" namespace ZeroTier { typedef WindowsEthernetTap EthernetTap; } #endif +#ifdef __BSD__ +#include "../osdep/BSDEthernetTap.hpp" +namespace ZeroTier { typedef BSDEthernetTap EthernetTap; } +#endif // Sanity limits for HTTP #define ZT_MAX_HTTP_MESSAGE_SIZE (1024 * 1024 * 8) -- cgit v1.2.3 From 38243e5eff71b76d35904afffd2b21fe84ed958a Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Sat, 16 May 2015 14:07:15 -0700 Subject: OSX build fix --- service/OneService.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'service/OneService.cpp') diff --git a/service/OneService.cpp b/service/OneService.cpp index dd919474..99aaf77d 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -70,7 +70,7 @@ namespace ZeroTier { typedef LinuxEthernetTap EthernetTap; } #include "../osdep/WindowsEthernetTap.hpp" namespace ZeroTier { typedef WindowsEthernetTap EthernetTap; } #endif -#ifdef __BSD__ +#if defined(__BSD__) && (!defined(__APPLE__)) #include "../osdep/BSDEthernetTap.hpp" namespace ZeroTier { typedef BSDEthernetTap EthernetTap; } #endif -- cgit v1.2.3