From bf1b8852c74494e9475f811b68b18584d99e966e Mon Sep 17 00:00:00 2001 From: Vitaly Miniakhmetov Date: Wed, 27 Jul 2022 17:23:12 +0500 Subject: [PATCH] Fix for PRI*PTR (inttypes.h) --- include/lib/libc/aarch32/inttypes_.h | 7 +++++++ include/lib/libc/aarch64/inttypes_.h | 7 +++++++ include/lib/libc/inttypes.h | 6 ------ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/include/lib/libc/aarch32/inttypes_.h b/include/lib/libc/aarch32/inttypes_.h index 11d2d35258b..ef3fb8f7d4b 100644 --- a/include/lib/libc/aarch32/inttypes_.h +++ b/include/lib/libc/aarch32/inttypes_.h @@ -18,4 +18,11 @@ #define PRIx64 "llx" /* uint64_t */ #define PRIX64 "llX" /* uint64_t */ +#define PRIdPTR "d" /* intptr_t */ +#define PRIiPTR "i" /* intptr_t */ +#define PRIoPTR "o" /* intptr_t */ +#define PRIuPTR "u" /* uintptr_t */ +#define PRIxPTR "x" /* uintptr_t */ +#define PRIXPTR "X" /* uintptr_t */ + #endif /* INTTYPES__H */ diff --git a/include/lib/libc/aarch64/inttypes_.h b/include/lib/libc/aarch64/inttypes_.h index 197d627bc6a..f25882f2cc2 100644 --- a/include/lib/libc/aarch64/inttypes_.h +++ b/include/lib/libc/aarch64/inttypes_.h @@ -18,4 +18,11 @@ #define PRIx64 "lx" /* uint64_t */ #define PRIX64 "lX" /* uint64_t */ +#define PRIdPTR "ld" /* intptr_t */ +#define PRIiPTR "li" /* intptr_t */ +#define PRIoPTR "lo" /* intptr_t */ +#define PRIuPTR "lu" /* uintptr_t */ +#define PRIxPTR "lx" /* uintptr_t */ +#define PRIXPTR "lX" /* uintptr_t */ + #endif /* INTTYPES__H */ diff --git a/include/lib/libc/inttypes.h b/include/lib/libc/inttypes.h index 0f9e8c61289..6ad1c9e1077 100644 --- a/include/lib/libc/inttypes.h +++ b/include/lib/libc/inttypes.h @@ -17,31 +17,25 @@ #define PRId8 "d" /* int8_t */ #define PRId16 "d" /* int16_t */ #define PRId32 "d" /* int32_t */ -#define PRIdPTR "d" /* intptr_t */ #define PRIi8 "i" /* int8_t */ #define PRIi16 "i" /* int16_t */ #define PRIi32 "i" /* int32_t */ -#define PRIiPTR "i" /* intptr_t */ #define PRIo8 "o" /* int8_t */ #define PRIo16 "o" /* int16_t */ #define PRIo32 "o" /* int32_t */ -#define PRIoPTR "o" /* intptr_t */ #define PRIu8 "u" /* uint8_t */ #define PRIu16 "u" /* uint16_t */ #define PRIu32 "u" /* uint32_t */ -#define PRIuPTR "u" /* uintptr_t */ #define PRIx8 "x" /* uint8_t */ #define PRIx16 "x" /* uint16_t */ #define PRIx32 "x" /* uint32_t */ -#define PRIxPTR "x" /* uintptr_t */ #define PRIX8 "X" /* uint8_t */ #define PRIX16 "X" /* uint16_t */ #define PRIX32 "X" /* uint32_t */ -#define PRIXPTR "X" /* uintptr_t */ #endif