From a3710251a71b8bd5b3878c8c78983a9d972f2704 Mon Sep 17 00:00:00 2001
From: Nick Tiskov <daymansmail@gmail.com>
Date: Fri, 19 Sep 2014 17:42:40 +0400
Subject: [PATCH] Fix large cache support on amd64 arch

Conflicts:
	src/preferences/preferences.cpp
---
 src/preferences/preferences.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/preferences/preferences.h b/src/preferences/preferences.h
index 7fc99821e..50569e46b 100755
--- a/src/preferences/preferences.h
+++ b/src/preferences/preferences.h
@@ -993,7 +993,7 @@ public:
 
     // 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
-#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
     if (size > 1800)
       size = 1800;
@@ -1012,7 +1012,7 @@ public:
   void setDiskCacheSize(uint 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
     if (size0 > 1800)
       size0 = 1800;