Merge dev

windows/ZeroTierOne/ZeroTierOneService.cpp

@@ -13,6 +13,8 @@
 
 #pragma region Includes
 
+#if defined(_WIN32) || defined(_WIN64)
+
 #include <WinSock2.h>
 #include <Windows.h>
 #include <stdio.h>
@@ -150,3 +152,5 @@ void ZeroTierOneService::OnShutdown()
 	// stop thread on system shutdown (if it hasn't happened already)
 	OnStop();
 }
+
+#endif

windows/ZeroTierOne/ZeroTierOneService.h

@@ -13,6 +13,8 @@
 
 #pragma once
 
+#if defined(_WIN32) || defined(_WIN64)
+
 #include <stdio.h>
 
 #include "ServiceBase.h"
@@ -64,3 +66,5 @@ private:
 	ZeroTier::Mutex _lock;
 	ZeroTier::Thread _thread;
 };
+
+#endif