From e609559f069137f589f55eb7511135d066a7c419 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 8 Sep 2016 03:33:05 -0400 Subject: [PATCH] Use "unsigned long" rather than "unsigned long long" for word64 when '_LP64 || __LP64__' Guard use of the change on CRYPTOPP_MAINTAIN_BACKWARDS_COMPATIBILITY_562 --- config.h | 2 +- config.recommend | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.h b/config.h index 0d99df57..8c58004d 100644 --- a/config.h +++ b/config.h @@ -217,7 +217,7 @@ typedef unsigned int word32; #if defined(_MSC_VER) || defined(__BORLANDC__) typedef unsigned __int64 word64; #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; #define W64LIT(x) x##UL #else diff --git a/config.recommend b/config.recommend index 966a6da8..2b28d541 100644 --- a/config.recommend +++ b/config.recommend @@ -217,7 +217,7 @@ typedef unsigned int word32; #if defined(_MSC_VER) || defined(__BORLANDC__) typedef unsigned __int64 word64; #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; #define W64LIT(x) x##UL #else