Merge 'master' into 'hmqv'

pull/263/head
Jeffrey Walton 2016-09-08 03:33:23 -04:00
commit a122e53b61
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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