mirrors/ZeroTierOne
1
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2026-01-10 11:11:39 -08:00
Code Issues 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
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

6
service/OneService.cpp
View file

@ -56,9 +56,9 @@
#include <zeroidc.h>
#ifdef __WINDOWS__
#include <WinSock2.h>
#include <Windows.h>
#include <ShlObj.h>
#include <winsock2.h>
#include <windows.h>
#include <shlobj.h>
#include <netioapi.h>
#include <iphlpapi.h>
//#include <unistd.h>