VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Crypto
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2019-10-28 18:57:07 +0100
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2019-10-28 18:59:07 +0100
commit3fa636d477119fff6e372074568edb42d038f508 (patch)
tree31cb725801e66e4ebf4121ba4ae40fa63f27e082 /src/Crypto
parent659df4c6dfb03e83f18985f55f8b9069f7b5bed9 (diff)
downloadVeraCrypt-3fa636d477119fff6e372074568edb42d038f508.tar.gz
VeraCrypt-3fa636d477119fff6e372074568edb42d038f508.zip
Linux: Fix compilation error if type __u64 is already defined by gcc
This is the case with Mageia Cauldron which has gcc 9.2.1
Diffstat (limited to 'src/Crypto')
-rw-r--r--src/Crypto/jitterentropy-base-user.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/Crypto/jitterentropy-base-user.h b/src/Crypto/jitterentropy-base-user.h
index 04c19361..0ebbac5d 100644
--- a/src/Crypto/jitterentropy-base-user.h
+++ b/src/Crypto/jitterentropy-base-user.h
@@ -49,8 +49,6 @@
#include <stdlib.h>
#include <string.h>
-typedef uint64 __u64;
-
#ifdef _MSC_VER
typedef uint64 uint64_t;
@@ -70,7 +68,7 @@ typedef int32 ssize_t;
#endif
#endif
-static VC_INLINE void jent_get_nstime(__u64 *out)
+static VC_INLINE void jent_get_nstime(uint64 *out)
{
*out = __rdtsc();;
}
@@ -80,7 +78,7 @@ static VC_INLINE void jent_get_nstime(__u64 *out)
/* taken from Linux kernel */
#if CRYPTOPP_BOOL_X64
#define DECLARE_ARGS(val, low, high) unsigned low, high
-#define EAX_EDX_VAL(val, low, high) ((low) | ((__u64)(high) << 32))
+#define EAX_EDX_VAL(val, low, high) ((low) | ((uint64)(high) << 32))
#define EAX_EDX_RET(val, low, high) "=a" (low), "=d" (high)
#else
#define DECLARE_ARGS(val, low, high) unsigned long long val
@@ -88,7 +86,7 @@ static VC_INLINE void jent_get_nstime(__u64 *out)
#define EAX_EDX_RET(val, low, high) "=A" (val)
#endif
-VC_INLINE void jent_get_nstime(__u64 *out)
+VC_INLINE void jent_get_nstime(uint64 *out)
{
DECLARE_ARGS(val, low, high);
asm volatile("rdtsc" : EAX_EDX_RET(val, low, high));