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

4
node/Constants.hpp
View file

@ -92,8 +92,8 @@
#pragma warning(disable : 4101)
#undef __UNIX_LIKE__
#undef __BSD__
#include <WinSock2.h>
#include <Windows.h>
#include <winsock2.h>
#include <windows.h>
#endif
#ifdef __NetBSD__

2
node/Mutex.hpp
View file

@ -86,7 +86,7 @@ private:
#ifdef __WINDOWS__
#include <stdlib.h>
#include <Windows.h>
#include <windows.h>
namespace ZeroTier {

2
node/Salsa20.hpp
View file

@ -15,7 +15,7 @@
#include "Constants.hpp"
#include "Utils.hpp"
#if (!defined(ZT_SALSA20_SSE)) && (defined(__SSE2__) || defined(__WINDOWS__))
#if (!defined(ZT_SALSA20_SSE)) && (defined(__SSE2__) || (defined(__WINDOWS__) && !defined(__MINGW32__)))
#define ZT_SALSA20_SSE 1
#endif