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

6
include/ZeroTierOne.h
View file

@ -23,9 +23,9 @@
// For the struct sockaddr_storage structure
#if defined(_WIN32) || defined(_WIN64)
#include <WinSock2.h>
#include <WS2tcpip.h>
#include <Windows.h>
#include <winsock2.h>
#include <ws2tcpip.h>
#include <windows.h>
#else /* not Windows */
#include <arpa/inet.h>
#include <netinet/in.h>