Merge of netcon with edge and unification of make processes.

2015-12-04 13:19:31 -08:00
parent ac8918992b
commit 425d311ce8
13 changed files with 36 additions and 148 deletions
--- 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