Fix large cache support on amd64 arch

Conflicts:
	src/preferences/preferences.cpp
This commit is contained in:
Nick Tiskov 2014-09-19 17:42:40 +04:00 committed by sledgehammer999
commit a3710251a7

View file

@ -993,7 +993,7 @@ public:
// When build as 32bit binary, set the maximum at less than 2GB to prevent crashes. // When build as 32bit binary, set the maximum at less than 2GB to prevent crashes.
// These macros may not be available on compilers other than MSVC and GCC // These macros may not be available on compilers other than MSVC and GCC
#if !defined(_M_X64) || !defined(__amd64__) #if !defined(_M_X64) && !defined(__amd64__)
//1800MiB to leave 248MiB room to the rest of program data in RAM //1800MiB to leave 248MiB room to the rest of program data in RAM
if (size > 1800) if (size > 1800)
size = 1800; size = 1800;
@ -1012,7 +1012,7 @@ public:
void setDiskCacheSize(uint size) { void setDiskCacheSize(uint size) {
uint size0 = size; uint size0 = size;
#if !defined(_M_X64) || !defined(__amd64__) #if !defined(_M_X64) && !defined(__amd64__)
//1800MiB to leave 248MiB room to the rest of program data in RAM //1800MiB to leave 248MiB room to the rest of program data in RAM
if (size0 > 1800) if (size0 > 1800)
size0 = 1800; size0 = 1800;