From: Lionel Sambuc Date: Sun, 3 Feb 2013 21:27:36 +0000 (+0100) Subject: Adapt ARM print macro to match used types X-Git-Tag: v3.3.0~1089 X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=refs%2Fchanges%2F98%2F398%2F2;p=minix.git Adapt ARM print macro to match used types Change-Id: I987c669dce30d97ff67e33a50106a07163f7d7f1 --- diff --git a/sys/arch/arm/include/int_fmtio.h b/sys/arch/arm/include/int_fmtio.h index f387c82e4..58eb387d7 100644 --- a/sys/arch/arm/include/int_fmtio.h +++ b/sys/arch/arm/include/int_fmtio.h @@ -51,7 +51,7 @@ #define PRIdFAST32 "d" /* int_fast32_t */ #define PRIdFAST64 "lld" /* int_fast64_t */ #define PRIdMAX "lld" /* intmax_t */ -#define PRIdPTR "ld" /* intptr_t */ +#define PRIdPTR "d" /* intptr_t */ #define PRIi8 "i" /* int8_t */ #define PRIi16 "i" /* int16_t */ @@ -66,7 +66,7 @@ #define PRIiFAST32 "i" /* int_fast32_t */ #define PRIiFAST64 "lli" /* int_fast64_t */ #define PRIiMAX "lli" /* intmax_t */ -#define PRIiPTR "li" /* intptr_t */ +#define PRIiPTR "i" /* intptr_t */ /* fprintf macros for unsigned integers */ @@ -83,7 +83,7 @@ #define PRIoFAST32 "o" /* uint_fast32_t */ #define PRIoFAST64 "llo" /* uint_fast64_t */ #define PRIoMAX "llo" /* uintmax_t */ -#define PRIoPTR "lo" /* uintptr_t */ +#define PRIoPTR "o" /* uintptr_t */ #define PRIu8 "u" /* uint8_t */ #define PRIu16 "u" /* uint16_t */ @@ -98,7 +98,7 @@ #define PRIuFAST32 "u" /* uint_fast32_t */ #define PRIuFAST64 "llu" /* uint_fast64_t */ #define PRIuMAX "llu" /* uintmax_t */ -#define PRIuPTR "lu" /* uintptr_t */ +#define PRIuPTR "u" /* uintptr_t */ #define PRIx8 "x" /* uint8_t */ #define PRIx16 "x" /* uint16_t */ @@ -113,7 +113,7 @@ #define PRIxFAST32 "x" /* uint_fast32_t */ #define PRIxFAST64 "llx" /* uint_fast64_t */ #define PRIxMAX "llx" /* uintmax_t */ -#define PRIxPTR "lx" /* uintptr_t */ +#define PRIxPTR "x" /* uintptr_t */ #define PRIX8 "X" /* uint8_t */ #define PRIX16 "X" /* uint16_t */ @@ -128,7 +128,7 @@ #define PRIXFAST32 "X" /* uint_fast32_t */ #define PRIXFAST64 "llX" /* uint_fast64_t */ #define PRIXMAX "llX" /* uintmax_t */ -#define PRIXPTR "lX" /* uintptr_t */ +#define PRIXPTR "X" /* uintptr_t */ /* fscanf macros for signed integers */ @@ -160,7 +160,7 @@ #define SCNiFAST32 "i" /* int_fast32_t */ #define SCNiFAST64 "lli" /* int_fast64_t */ #define SCNiMAX "lli" /* intmax_t */ -#define SCNiPTR "li" /* intptr_t */ +#define SCNiPTR "i" /* intptr_t */ /* fscanf macros for unsigned integers */ @@ -177,7 +177,7 @@ #define SCNoFAST32 "o" /* uint_fast32_t */ #define SCNoFAST64 "llo" /* uint_fast64_t */ #define SCNoMAX "llo" /* uintmax_t */ -#define SCNoPTR "lo" /* uintptr_t */ +#define SCNoPTR "o" /* uintptr_t */ #define SCNu8 "hhu" /* uint8_t */ #define SCNu16 "hu" /* uint16_t */ @@ -192,7 +192,7 @@ #define SCNuFAST32 "u" /* uint_fast32_t */ #define SCNuFAST64 "llu" /* uint_fast64_t */ #define SCNuMAX "llu" /* uintmax_t */ -#define SCNuPTR "lu" /* uintptr_t */ +#define SCNuPTR "u" /* uintptr_t */ #define SCNx8 "hhx" /* uint8_t */ #define SCNx16 "hx" /* uint16_t */ @@ -207,6 +207,6 @@ #define SCNxFAST32 "x" /* uint_fast32_t */ #define SCNxFAST64 "llx" /* uint_fast64_t */ #define SCNxMAX "llx" /* uintmax_t */ -#define SCNxPTR "lx" /* uintptr_t */ +#define SCNxPTR "x" /* uintptr_t */ #endif /* !_ARM_INT_FMTIO_H_ */