updated included zerotierone src

2016-10-21 15:44:36 -07:00
parent 3dfea66bd4
commit 12bd9439db
105 changed files with 5083 additions and 6969 deletions
--- a/zerotierone/osdep/PortMapper.cpp
+++ b/zerotierone/osdep/PortMapper.cpp
@@ -41,19 +41,9 @@
 #endif
 #endif

-#ifdef ZT_USE_SYSTEM_MINIUPNPC
-#include <miniupnpc/miniupnpc.h>
-#include <miniupnpc/upnpcommands.h>
-#else
 #include "../ext/miniupnpc/miniupnpc.h"
 #include "../ext/miniupnpc/upnpcommands.h"
-#endif
-
-#ifdef ZT_USE_SYSTEM_NATPMP
-#include <natpmp.h>
-#else
 #include "../ext/libnatpmp/natpmp.h"
-#endif

 namespace ZeroTier {