Fix cannot convert between 'word64*' and 'uint64_t*' and -fpermissive
parent
f0f0408c89
commit
e2bf6824ff
3
config.h
3
config.h
|
|
@ -217,6 +217,9 @@ 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__))
|
||||||
|
typedef unsigned long word64;
|
||||||
|
#define W64LIT(x) x##UL
|
||||||
#else
|
#else
|
||||||
typedef unsigned long long word64;
|
typedef unsigned long long word64;
|
||||||
#define W64LIT(x) x##ULL
|
#define W64LIT(x) x##ULL
|
||||||
|
|
|
||||||
|
|
@ -217,6 +217,9 @@ 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__))
|
||||||
|
typedef unsigned long word64;
|
||||||
|
#define W64LIT(x) x##UL
|
||||||
#else
|
#else
|
||||||
typedef unsigned long long word64;
|
typedef unsigned long long word64;
|
||||||
#define W64LIT(x) x##ULL
|
#define W64LIT(x) x##ULL
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue