From 425d311ce81a366f78a7b9a2490b94b011cf625a Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 4 Dec 2015 13:19:31 -0800
Subject: Merge of netcon with edge and unification of make processes.

---
 netcon/NetconEthernetTap.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'netcon/NetconEthernetTap.cpp')

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
-- 
cgit v1.2.3