VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common/Crypto.h
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2016-08-16 22:06:57 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-08-16 22:08:18 (GMT)
commit2780ac962ec75f548acb616dd810515e528ac0b1 (patch)
tree3c89dab46a6f225b8e2caf04a8d51c6a29b0e6f0 /src/Common/Crypto.h
parente47f94cb4329cfefb0a9c4efaa353a1b54268b46 (diff)
downloadVeraCrypt-2780ac962ec75f548acb616dd810515e528ac0b1.zip
VeraCrypt-2780ac962ec75f548acb616dd810515e528ac0b1.tar.gz
Linux: fix various compilation issues under Linux.
Diffstat (limited to 'src/Common/Crypto.h')
-rw-r--r--src/Common/Crypto.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Common/Crypto.h b/src/Common/Crypto.h
index 7d99f23..6a943ed 100644
--- a/src/Common/Crypto.h
+++ b/src/Common/Crypto.h
@@ -171,9 +171,9 @@ typedef struct
#else
#ifdef TC_WINDOWS_BOOT
-#define MAX_EXPANDED_KEY max((AES_KS + SERPENT_KS + TWOFISH_KS), CAMELLIA_KS)
+#define MAX_EXPANDED_KEY VC_MAX((AES_KS + SERPENT_KS + TWOFISH_KS), CAMELLIA_KS)
#else
-#define MAX_EXPANDED_KEY max(max(max((AES_KS + SERPENT_KS + TWOFISH_KS), GOST_KS), CAMELLIA_KS), KUZNYECHIK_KS)
+#define MAX_EXPANDED_KEY VC_MAX(VC_MAX(VC_MAX((AES_KS + SERPENT_KS + TWOFISH_KS), GOST_KS), CAMELLIA_KS), KUZNYECHIK_KS)
#endif
#endif