github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/ultimatepp/ultimatepp

Browse source
This commit is contained in:
Mirek Fidler 2025-10-08 12:50:36 +02:00
commit 2ff3a99bc8
2 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/Core/Cpu.cpp
View file

@ -99,7 +99,6 @@ int CPU_Cores()
mib[0] = CTL_HW;
mib[1] = HW_NCPU;
sysctl(mib, 2, &n, &len, NULL, 0);
n = minmax(n, 1, 256);
#elif defined(PLATFORM_SOLARIS)
n = minmax((int)sysconf(_SC_NPROCESSORS_ONLN), 1, 256);
#else

2
uppsrc/Core/SSL/InitExit.cpp
View file

@ -131,13 +131,11 @@ static void sslExitThread()
void SslInitThread()
{
DLOG("+++ SslInitThread");
MemoryIgnoreLeaksBlock __;
if(sThreadInit || Thread::IsMain())
return;
sThreadInit = true;
sPrevExit = Thread::AtExit(sslExitThread);
DLOG("--- SslInitThread");
}
}