summaryrefslogtreecommitdiff
path: root/netcon/NetconEthernetTap.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@gmail.com>2015-12-04 13:19:31 -0800
committerAdam Ierymenko <adam.ierymenko@gmail.com>2015-12-04 13:19:31 -0800
commit425d311ce81a366f78a7b9a2490b94b011cf625a (patch)
tree3d10dfd99483c1432d16743a8327b04be0848ebf /netcon/NetconEthernetTap.cpp
parentac8918992b647c80c6da4b7c0956fd383b15e9d7 (diff)
downloadinfinitytier-425d311ce81a366f78a7b9a2490b94b011cf625a.tar.gz
infinitytier-425d311ce81a366f78a7b9a2490b94b011cf625a.zip
Merge of netcon with edge and unification of make processes.
Diffstat (limited to 'netcon/NetconEthernetTap.cpp')
-rw-r--r--netcon/NetconEthernetTap.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp
index 3f772883..f33e7ffa 100644
--- a/netcon/NetconEthernetTap.cpp
+++ b/netcon/NetconEthernetTap.cpp
@@ -25,8 +25,6 @@
* LLC. Start here: http://www.zerotier.com/
*/
-#ifdef ZT_ENABLE_NETCON
-
#include <algorithm>
#include <utility>
#include <dlfcn.h>
@@ -1551,5 +1549,3 @@ void NetconEthernetTap::handle_write(TcpConnection *conn)
}
} // namespace ZeroTier
-
-#endif // ZT_ENABLE_NETCON