VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2019-03-21 17:45:21 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2019-03-21 17:52:14 (GMT)
commit08a8a0ce302078d4937afbb77e0a09e602ad24c6 (patch)
treeb616213f7767dc24f2b40eb9607199f803596450
parent69df92c81de6d3844ae855e6f1aa6c7e4c784c32 (diff)
downloadVeraCrypt-master.zip
VeraCrypt-master.tar.gz
Linux: Fix compilation error caused by wrong include of "intrin.h"HEADmaster
-rw-r--r--src/Crypto/cpu.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Crypto/cpu.h b/src/Crypto/cpu.h
index 12576b4..ee8c16a 100644
--- a/src/Crypto/cpu.h
+++ b/src/Crypto/cpu.h
@@ -25,7 +25,7 @@
#define ATT_NOPREFIX
#endif
-#if CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64
+#ifdef _MSC_VER
#if defined(TC_WINDOWS_DRIVER) || defined (_UEFI)
#if defined(__cplusplus)
extern "C" {
@@ -36,11 +36,9 @@ extern unsigned __int64 __rdtsc();
#endif
#else
#include <intrin.h>
-#ifdef _MSC_VER
#pragma intrinsic(__rdtsc)
#endif
#endif
-#endif
#ifdef CRYPTOPP_GENERATE_X64_MASM