diff --git a/node/Packet.cpp b/node/Packet.cpp index b07f0bedb..756f3140c 100644 --- a/node/Packet.cpp +++ b/node/Packet.cpp @@ -273,7 +273,9 @@ union LZ4_streamDecode_u { #endif /* _MSC_VER */ #endif +#ifndef FORCE_INLINE #define FORCE_INLINE static inline +#endif #if (defined(__GNUC__) && (__GNUC__ >= 3)) || (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 800)) || defined(__clang__) # define expect(expr,value) (__builtin_expect ((expr),(value)) ) diff --git a/one.cpp b/one.cpp index 25a50dbb4..edefe82ec 100644 --- a/one.cpp +++ b/one.cpp @@ -1479,7 +1479,6 @@ int main(int argc,char **argv) #endif // __WINDOWS__ #ifdef __UNIX_LIKE__ - #ifdef ZT_HAVE_DROP_PRIVILEGES dropPrivileges(argv[0],homeDir); #endif @@ -1499,7 +1498,9 @@ int main(int argc,char **argv) thr.threadMain(); //Thread::join(Thread::start(&thr)); +#ifdef __UNIX_LIKE__ OSUtils::rm(pidPath.c_str()); +#endif return thr.returnValue; } diff --git a/osdep/OSUtils.cpp b/osdep/OSUtils.cpp index aac6bdd82..33e143dad 100644 --- a/osdep/OSUtils.cpp +++ b/osdep/OSUtils.cpp @@ -125,7 +125,7 @@ long OSUtils::cleanDirectory(const char *path,const uint64_t olderThan) date.LowPart = ffd.ftLastWriteTime.dwLowDateTime; if (date.QuadPart > 0) { date.QuadPart -= adjust.QuadPart; - if (((date.QuadPart / 10000000) * 1000) < olderThan) { + if ((uint64_t)((date.QuadPart / 10000000) * 1000) < olderThan) { Utils::snprintf(tmp, sizeof(tmp), "%s\\%s", path, ffd.cFileName); if (DeleteFileA(tmp)) ++cleaned; diff --git a/service/SoftwareUpdater.cpp b/service/SoftwareUpdater.cpp index 2afbc7765..7ecd42b15 100644 --- a/service/SoftwareUpdater.cpp +++ b/service/SoftwareUpdater.cpp @@ -148,9 +148,9 @@ void SoftwareUpdater::handleSoftwareUpdateUserMessage(uint64_t origin,const void std::vector dvArch; if (dvArch2.is_array()) { for(unsigned long i=0;isecond.meta[ZT_SOFTWARE_UPDATE_JSON_PLATFORM],0) == rvPlatform)&& diff --git a/windows/WinUI/AboutView.xaml b/windows/WinUI/AboutView.xaml index 5def46a68..7f4151f95 100644 --- a/windows/WinUI/AboutView.xaml +++ b/windows/WinUI/AboutView.xaml @@ -5,99 +5,31 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:WinUI" mc:Ignorable="d" - Title="AboutView" Height="460" Width="300" Icon="ZeroTierIcon.ico"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Title="AboutView" Height="368.267" Width="300" Icon="ZeroTierIcon.ico"> + + + + + + + + + + + + + + + + + + + + + + - +