razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fix error with ifdef blocks

Browse source 
noted by @linkmauve
This commit is contained in:
Campbell Barton 2016-03-29 15:49:16 +11:00
parent 1db1c004b9
commit b696885d9a
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
View file

@ -50,7 +50,7 @@ using namespace std;
#endif
#ifdef LINUX
#include <sys/sysctl.h> //For getting total memory
#include <sys/sysctl.h>
#endif
// forward declaration
@ -697,23 +697,19 @@ void FarmServer::queryHwInfo(HwInfo &hwInfo)
hwInfo.m_type = Irix;
#else
TINT64 physMemSize;
#ifdef MACOSX
int mib[2];
TINT64 physMemSize;
size_t len;
mib[0] = CTL_HW;
mib[1] = HW_MEMSIZE;
len = sizeof(physMemSize);
sysctl(mib, 2, &physMemSize, &len, NULL, 0);
#endif
#elif defined(LINUX)
physMemSize = (TINT64)sysconf(_SC_PHYS_PAGES) * (TINT64)sysconf(_SC_PAGE_SIZE);
#else
#warning "Unsupported platform!"
physMemSize = 500000000;
#ifdef LINUX
TINT64 physMemSize = (TINT64)sysconf(_SC_PHYS_PAGES) * (TINT64)sysconf(_SC_PAGE_SIZE);
#endif
hwInfo.m_cpuCount = TSystem::getProcessorCount();