From 8057c826bcac5c34c46ff072ee28549029adb94f Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 23 Aug 2019 09:34:26 -0700 Subject: [PATCH] cleanup --- osdep/LinuxNetLink.cpp | 6 ++++++ osdep/WindowsEthernetTap.cpp | 7 ++++++- osdep/WindowsEthernetTap.hpp | 7 ++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/osdep/LinuxNetLink.cpp b/osdep/LinuxNetLink.cpp index 8c2fc9d26..ea9fbaa68 100644 --- a/osdep/LinuxNetLink.cpp +++ b/osdep/LinuxNetLink.cpp @@ -11,6 +11,10 @@ */ /****/ +#include "../node/Constants.hpp" + +#ifdef __LINUX__ + #include "LinuxNetLink.hpp" #include @@ -1066,3 +1070,5 @@ int LinuxNetLink::_indexForInterface(const char *iface) } } // namespace ZeroTier + +#endif diff --git a/osdep/WindowsEthernetTap.cpp b/osdep/WindowsEthernetTap.cpp index fb4b498d1..0e25e315b 100644 --- a/osdep/WindowsEthernetTap.cpp +++ b/osdep/WindowsEthernetTap.cpp @@ -11,6 +11,10 @@ */ /****/ +#include "../node/Constants.hpp" + +#ifdef __WINDOWS__ + #include #include #include @@ -36,7 +40,6 @@ #include #include -#include "../node/Constants.hpp" #include "../node/Utils.hpp" #include "../node/Mutex.hpp" @@ -1291,3 +1294,5 @@ void WindowsEthernetTap::_syncIps() } } // namespace ZeroTier + +#endif diff --git a/osdep/WindowsEthernetTap.hpp b/osdep/WindowsEthernetTap.hpp index ea08b2fc0..7a3c9e42a 100644 --- a/osdep/WindowsEthernetTap.hpp +++ b/osdep/WindowsEthernetTap.hpp @@ -14,6 +14,10 @@ #ifndef ZT_WINDOWSETHERNETTAP_HPP #define ZT_WINDOWSETHERNETTAP_HPP +#include "../node/Constants.hpp" + +#ifdef __WINDOWS__ + #include #include @@ -23,7 +27,6 @@ #include #include -#include "../node/Constants.hpp" #include "../node/Mutex.hpp" #include "../node/MulticastGroup.hpp" #include "../node/InetAddress.hpp" @@ -155,3 +158,5 @@ private: } // namespace ZeroTier #endif + +#endif