dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into zeroidc

Browse source
This commit is contained in:
Grant Limberg 2022-01-05 08:35:15 -08:00
commit dceba1f2f1
No known key found for this signature in database
GPG key ID: 2BA62CCABBB4095A
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>