From a2c7dbd97a22febdb19b8a82cfea4fda7af0d4b6 Mon Sep 17 00:00:00 2001 From: Steve Lhomme Date: Fri, 16 Feb 2024 07:45:25 +0100 Subject: [PATCH 2/3] Define LPRI(d|ud|x)64 as Unicode (wide) versions of AMFPRI(d|ud|x)64 It's always true for all platforms. --- core/Platform.h | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/core/Platform.h b/core/Platform.h index 2ced091..12541f3 100644 --- a/core/Platform.h +++ b/core/Platform.h @@ -124,13 +110,10 @@ typedef signed int HRESULT; #endif #define AMFPRId64 "I64d" - #define LPRId64 L"I64d" #define AMFPRIud64 "Iu64d" - #define LPRIud64 L"Iu64d" #define AMFPRIx64 "I64x" - #define LPRIx64 L"I64x" #else // !WIN32 - Linux and Mac @@ -147,26 +130,24 @@ typedef signed int HRESULT; #if defined(__x86_64__) || defined(__aarch64__) #define AMFPRId64 "ld" - #define LPRId64 L"ld" #define AMFPRIud64 "uld" - #define LPRIud64 L"uld" #define AMFPRIx64 "lx" - #define LPRIx64 L"lx" #else #define AMFPRId64 "lld" - #define LPRId64 L"lld" #define AMFPRIud64 "ulld" - #define LPRIud64 L"ulld" #define AMFPRIx64 "llx" - #define LPRIx64 L"llx" #endif #endif // WIN32 +#define LPRId64 AMF_UNICODE(AMFPRId64) +#define LPRIud64 AMF_UNICODE(AMFPRIud64) +#define LPRIx64 AMF_UNICODE(AMFPRIx64) + #if defined(_WIN32) #define AMF_WEAK __declspec( selectany ) -- 2.45.0.windows.1