void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 12:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/zerotier/ZeroTierOne into dev

Browse source
This commit is contained in:
Adam Ierymenko 2019-08-23 11:13:13 -07:00
commit 5c5e7fc7ff
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
windows/ZeroTierOne/ZeroTierOneService.cpp
View file

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

4
windows/ZeroTierOne/ZeroTierOneService.h
View file

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