ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-23 09:25:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into zeroidc

Browse Source
This commit is contained in:
Grant Limberg
2022-01-05 08:35:15 -08:00
parent 50b866c5cf 73878fbdc4
commit dceba1f2f1
18 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
windows/ZeroTierOne/ServiceBase.h
View File

@ -18,7 +18,7 @@
#pragma once
#include <WinSock2.h>
#include <winsock2.h>
#include <windows.h>
class CServiceBase

4
windows/ZeroTierOne/ZeroTierOneService.cpp
View File

@ -15,8 +15,8 @@
#if defined(_WIN32) || defined(_WIN64)
#include <WinSock2.h>
#include <Windows.h>
#include <winsock2.h>
#include <windows.h>
#include <stdio.h>
#include <stdlib.h>