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.hpp
+++ b/netcon/NetconEthernetTap.hpp
@@ -28,8 +28,6 @@
 #ifndef ZT_NETCONETHERNETTAP_HPP
 #define ZT_NETCONETHERNETTAP_HPP

-#ifdef ZT_ENABLE_NETCON
-
 #include <stdio.h>
 #include <stdlib.h>

@@ -182,6 +180,4 @@ private:

 } // namespace ZeroTier

-#endif // ZT_ENABLE_NETCON
-
 #endif