From e2bf6824ff862e2bd975593248cc7ed3158addad Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 24 Jul 2016 13:40:58 -0400 Subject: [PATCH] Fix cannot convert between 'word64*' and 'uint64_t*' and -fpermissive --- config.h | 3 +++ config.recommend | 3 +++ 2 files changed, 6 insertions(+) diff --git a/config.h b/config.h index a5c0c09b..73af8e27 100644 --- a/config.h +++ b/config.h @@ -217,6 +217,9 @@ typedef unsigned int word32; #if defined(_MSC_VER) || defined(__BORLANDC__) typedef unsigned __int64 word64; #define W64LIT(x) x##ui64 +#elif ((__arm64__ || __aarch64__) && (_LP64 || __LP64__)) + typedef unsigned long word64; + #define W64LIT(x) x##UL #else typedef unsigned long long word64; #define W64LIT(x) x##ULL diff --git a/config.recommend b/config.recommend index 587ff044..19c32822 100644 --- a/config.recommend +++ b/config.recommend @@ -217,6 +217,9 @@ typedef unsigned int word32; #if defined(_MSC_VER) || defined(__BORLANDC__) typedef unsigned __int64 word64; #define W64LIT(x) x##ui64 +#elif ((__arm64__ || __aarch64__) && (_LP64 || __LP64__)) + typedef unsigned long word64; + #define W64LIT(x) x##UL #else typedef unsigned long long word64; #define W64LIT(x) x##ULL