github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-07-11 23:56:37 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Windows build fixes from clang-format, disable for Windows include order

Browse source
This commit is contained in:
Adam Ierymenko 2025-07-08 15:11:57 -04:00
parent db6045fe9c
commit 16dd3fd7af
4 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/ZeroTierOne.h
View file

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

2
one.cpp
View file

@ -26,6 +26,7 @@
#include "node/Constants.hpp" #include "node/Constants.hpp"
#ifdef __WINDOWS__ #ifdef __WINDOWS__
// clang-format off
#include <winsock2.h> #include <winsock2.h>
#include <windows.h> #include <windows.h>
#include <tchar.h> #include <tchar.h>
@ -40,6 +41,7 @@
#include "windows/ZeroTierOne/ServiceInstaller.h" #include "windows/ZeroTierOne/ServiceInstaller.h"
#include "windows/ZeroTierOne/ServiceBase.h" #include "windows/ZeroTierOne/ServiceBase.h"
#include "windows/ZeroTierOne/ZeroTierOneService.h" #include "windows/ZeroTierOne/ZeroTierOneService.h"
// clang-format on
#else #else
#include <unistd.h> #include <unistd.h>
#include <pwd.h> #include <pwd.h>

9
windows/ZeroTierOne/ZeroTierOne.vcxproj
View file

@ -66,17 +66,10 @@
<ClCompile Include="..\..\node\AES_aesni.cpp" /> <ClCompile Include="..\..\node\AES_aesni.cpp" />
<ClCompile Include="..\..\node\AES_armcrypto.cpp" /> <ClCompile Include="..\..\node\AES_armcrypto.cpp" />
<ClCompile Include="..\..\node\Bond.cpp" /> <ClCompile Include="..\..\node\Bond.cpp" />
<ClCompile Include="..\..\node\C25519.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MaxSpeed</Optimization>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MaxSpeed</Optimization>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">MaxSpeed</Optimization>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Default</BasicRuntimeChecks>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Default</BasicRuntimeChecks>
<BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">Default</BasicRuntimeChecks>
</ClCompile>
<ClCompile Include="..\..\node\Capability.cpp" /> <ClCompile Include="..\..\node\Capability.cpp" />
<ClCompile Include="..\..\node\CertificateOfMembership.cpp" /> <ClCompile Include="..\..\node\CertificateOfMembership.cpp" />
<ClCompile Include="..\..\node\CertificateOfOwnership.cpp" /> <ClCompile Include="..\..\node\CertificateOfOwnership.cpp" />
<ClCompile Include="..\..\node\ECC.cpp" />
<ClCompile Include="..\..\node\Identity.cpp" /> <ClCompile Include="..\..\node\Identity.cpp" />
<ClCompile Include="..\..\node\IncomingPacket.cpp" /> <ClCompile Include="..\..\node\IncomingPacket.cpp" />
<ClCompile Include="..\..\node\InetAddress.cpp" /> <ClCompile Include="..\..\node\InetAddress.cpp" />

6
windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
View file

@ -96,9 +96,6 @@
<ClCompile Include="..\..\osdep\OSUtils.cpp"> <ClCompile Include="..\..\osdep\OSUtils.cpp">
<Filter>Source Files\osdep</Filter> <Filter>Source Files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\node\C25519.cpp">
<Filter>Source Files\node</Filter>
</ClCompile>
<ClCompile Include="..\..\node\CertificateOfMembership.cpp"> <ClCompile Include="..\..\node\CertificateOfMembership.cpp">
<Filter>Source Files\node</Filter> <Filter>Source Files\node</Filter>
</ClCompile> </ClCompile>
@ -297,6 +294,9 @@
<ClCompile Include="..\..\node\PacketMultiplexer.cpp"> <ClCompile Include="..\..\node\PacketMultiplexer.cpp">
<Filter>Source Files\node</Filter> <Filter>Source Files\node</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\node\ECC.cpp">
<Filter>Source Files\node</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="resource.h"> <ClInclude Include="resource.h">