github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-08 02:54:56 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: Fixed compilation issue in MacOS

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@14583 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-06-13 08:14:58 +00:00
parent b36c9bd59d
commit 4e1d85ec27
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Core.upp
View file

@ -163,8 +163,6 @@ file
Topic.cpp,
CoWork.h,
CoWork.cpp,
ValueCache.h,
ValueCache.cpp,
Hash.h,
MD5.cpp,
SHA1.cpp,

10
uppsrc/Core/Cpu.cpp
View file

@ -8,6 +8,11 @@
#endif
#endif
#ifdef PLATFORM_MACOS
#include <mach/mach.h>
#include <mach/vm_statistics.h>
#endif
namespace Upp {
#ifdef CPU_X86
@ -129,11 +134,6 @@ int CPU_Cores()
#endif
#ifdef PLATFORM_MACOS
#include <mach/mach.h>
#include <mach/vm_statistics.h>
#endif
void GetSystemMemoryStatus(uint64& total, uint64& available)
{
#ifdef PLATFORM_WIN32