Merge 'master' into 'hmqv'
commit
a122e53b61
2
config.h
2
config.h
|
|
@ -217,7 +217,7 @@ typedef unsigned int word32;
|
||||||
#if defined(_MSC_VER) || defined(__BORLANDC__)
|
#if defined(_MSC_VER) || defined(__BORLANDC__)
|
||||||
typedef unsigned __int64 word64;
|
typedef unsigned __int64 word64;
|
||||||
#define W64LIT(x) x##ui64
|
#define W64LIT(x) x##ui64
|
||||||
#elif ((__arm64__ || __aarch64__) && (_LP64 || __LP64__))
|
#elif (_LP64 || __LP64__) && ((__arm64__ || __aarch64__) || !defined(CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562))
|
||||||
typedef unsigned long word64;
|
typedef unsigned long word64;
|
||||||
#define W64LIT(x) x##UL
|
#define W64LIT(x) x##UL
|
||||||
#else
|
#else
|
||||||
|
|
|
||||||
|
|
@ -217,7 +217,7 @@ typedef unsigned int word32;
|
||||||
#if defined(_MSC_VER) || defined(__BORLANDC__)
|
#if defined(_MSC_VER) || defined(__BORLANDC__)
|
||||||
typedef unsigned __int64 word64;
|
typedef unsigned __int64 word64;
|
||||||
#define W64LIT(x) x##ui64
|
#define W64LIT(x) x##ui64
|
||||||
#elif ((__arm64__ || __aarch64__) && (_LP64 || __LP64__))
|
#elif (_LP64 || __LP64__) && ((__arm64__ || __aarch64__) || !defined(CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562))
|
||||||
typedef unsigned long word64;
|
typedef unsigned long word64;
|
||||||
#define W64LIT(x) x##UL
|
#define W64LIT(x) x##UL
|
||||||
#else
|
#else
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue