You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by je...@apache.org on 2020/06/10 06:24:59 UTC

[incubator-nuttx] 02/02: arch: Move PRIxMAX and SCNxMAX definition to include/stdint.h

This is an automated email from the ASF dual-hosted git repository.

jerpelea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 4fbbd2e3bf446fb9b24a1f19c322dcc087763433
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Jun 10 11:11:27 2020 +0800

    arch: Move PRIxMAX and SCNxMAX definition to include/stdint.h
    
    like other related macro(e.g. INTMAX_MIN, INTMAX_MAX...)
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
    Change-Id: I8863599960b1a9b1c22ae9c35735a379a4c745b0
---
 arch/arm/include/inttypes.h            | 11 -----------
 arch/avr/include/avr/inttypes.h        | 11 -----------
 arch/avr/include/avr32/inttypes.h      | 11 -----------
 arch/hc/include/inttypes.h             | 22 ----------------------
 arch/mips/include/inttypes.h           | 11 -----------
 arch/misoc/include/inttypes.h          | 11 -----------
 arch/or1k/include/inttypes.h           | 11 -----------
 arch/renesas/include/m16c/inttypes.h   | 11 -----------
 arch/renesas/include/rx65n/inttypes.h  | 11 -----------
 arch/renesas/include/sh1/inttypes.h    | 11 -----------
 arch/risc-v/include/inttypes.h         | 11 -----------
 arch/sim/include/inttypes.h            | 14 --------------
 arch/x86/include/i486/inttypes.h       | 11 -----------
 arch/x86_64/include/intel64/inttypes.h | 11 -----------
 arch/xtensa/include/inttypes.h         | 11 -----------
 arch/z16/include/inttypes.h            | 11 -----------
 arch/z80/include/ez80/inttypes.h       | 22 ----------------------
 arch/z80/include/z180/inttypes.h       | 11 -----------
 arch/z80/include/z8/inttypes.h         | 11 -----------
 arch/z80/include/z80/inttypes.h        | 11 -----------
 include/stdint.h                       | 26 ++++++++++++++++++++++++++
 21 files changed, 26 insertions(+), 245 deletions(-)

diff --git a/arch/arm/include/inttypes.h b/arch/arm/include/inttypes.h
index 42ea4d0..1d0ab3b 100644
--- a/arch/arm/include/inttypes.h
+++ b/arch/arm/include/inttypes.h
@@ -59,7 +59,6 @@
 #define PRIdFAST32  "d"
 #define PRIdFAST64  "lld"
 
-#define PRIdMAX     "lld"
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
@@ -77,7 +76,6 @@
 #define PRIiFAST32  "i"
 #define PRIiFAST64  "lli"
 
-#define PRIiMAX     "lli"
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
@@ -95,7 +93,6 @@
 #define PRIoFAST32  "o"
 #define PRIoFAST64  "llo"
 
-#define PRIoMAX     "llo"
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
@@ -113,7 +110,6 @@
 #define PRIuFAST32  "u"
 #define PRIuFAST64  "llu"
 
-#define PRIuMAX     "llu"
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
@@ -131,7 +127,6 @@
 #define PRIxFAST32  "x"
 #define PRIxFAST64  "llx"
 
-#define PRIxMAX     "llx"
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
@@ -149,7 +144,6 @@
 #define PRIXFAST32  "X"
 #define PRIXFAST64  "llX"
 
-#define PRIXMAX     "llX"
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
@@ -167,7 +161,6 @@
 #define SCNdFAST32  "d"
 #define SCNdFAST64  "lld"
 
-#define SCNdMAX     "lld"
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
@@ -185,7 +178,6 @@
 #define SCNiFAST32  "i"
 #define SCNiFAST64  "lli"
 
-#define SCNiMAX     "lli"
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
@@ -203,7 +195,6 @@
 #define SCNoFAST32  "o"
 #define SCNoFAST64  "llo"
 
-#define SCNoMAX     "llo"
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
@@ -221,7 +212,6 @@
 #define SCNuFAST32  "u"
 #define SCNuFAST64  "llu"
 
-#define SCNuMAX     "llu"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -239,7 +229,6 @@
 #define SCNxFAST32  "x"
 #define SCNxFAST64  "llx"
 
-#define SCNxMAX     "llx"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/arch/avr/include/avr/inttypes.h b/arch/avr/include/avr/inttypes.h
index 8913f1c..12ed0b0 100644
--- a/arch/avr/include/avr/inttypes.h
+++ b/arch/avr/include/avr/inttypes.h
@@ -59,7 +59,6 @@
 #define PRIdFAST32  "ld"
 #define PRIdFAST64  "lld"
 
-#define PRIdMAX     "lld"
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
@@ -77,7 +76,6 @@
 #define PRIiFAST32  "li"
 #define PRIiFAST64  "lli"
 
-#define PRIiMAX     "lli"
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
@@ -95,7 +93,6 @@
 #define PRIoFAST32  "lo"
 #define PRIoFAST64  "llo"
 
-#define PRIoMAX     "llo"
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
@@ -113,7 +110,6 @@
 #define PRIuFAST32  "lu"
 #define PRIuFAST64  "llu"
 
-#define PRIuMAX     "llu"
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
@@ -131,7 +127,6 @@
 #define PRIxFAST32  "lx"
 #define PRIxFAST64  "llx"
 
-#define PRIxMAX     "llx"
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
@@ -149,7 +144,6 @@
 #define PRIXFAST32  "lX"
 #define PRIXFAST64  "llX"
 
-#define PRIXMAX     "llX"
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
@@ -167,7 +161,6 @@
 #define SCNdFAST32  "ld"
 #define SCNdFAST64  "lld"
 
-#define SCNdMAX     "lld"
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
@@ -185,7 +178,6 @@
 #define SCNiFAST32  "li"
 #define SCNiFAST64  "lli"
 
-#define SCNiMAX     "lli"
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
@@ -203,7 +195,6 @@
 #define SCNoFAST32  "lo"
 #define SCNoFAST64  "llo"
 
-#define SCNoMAX     "llo"
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
@@ -221,7 +212,6 @@
 #define SCNuFAST32  "lu"
 #define SCNuFAST64  "llu"
 
-#define SCNuMAX     "llu"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -239,7 +229,6 @@
 #define SCNxFAST32  "lx"
 #define SCNxFAST64  "llx"
 
-#define SCNxMAX     "llx"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/arch/avr/include/avr32/inttypes.h b/arch/avr/include/avr32/inttypes.h
index fb4d60b..2d9f7ce 100644
--- a/arch/avr/include/avr32/inttypes.h
+++ b/arch/avr/include/avr32/inttypes.h
@@ -59,7 +59,6 @@
 #define PRIdFAST32  "d"
 #define PRIdFAST64  "lld"
 
-#define PRIdMAX     "lld"
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
@@ -77,7 +76,6 @@
 #define PRIiFAST32  "i"
 #define PRIiFAST64  "lli"
 
-#define PRIiMAX     "lli"
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
@@ -95,7 +93,6 @@
 #define PRIoFAST32  "o"
 #define PRIoFAST64  "llo"
 
-#define PRIoMAX     "llo"
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
@@ -113,7 +110,6 @@
 #define PRIuFAST32  "u"
 #define PRIuFAST64  "llu"
 
-#define PRIuMAX     "llu"
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
@@ -131,7 +127,6 @@
 #define PRIxFAST32  "x"
 #define PRIxFAST64  "llx"
 
-#define PRIxMAX     "llx"
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
@@ -149,7 +144,6 @@
 #define PRIXFAST32  "X"
 #define PRIXFAST64  "llX"
 
-#define PRIXMAX     "llX"
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
@@ -167,7 +161,6 @@
 #define SCNdFAST32  "d"
 #define SCNdFAST64  "lld"
 
-#define SCNdMAX     "lld"
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
@@ -185,7 +178,6 @@
 #define SCNiFAST32  "i"
 #define SCNiFAST64  "lli"
 
-#define SCNiMAX     "lli"
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
@@ -203,7 +195,6 @@
 #define SCNoFAST32  "o"
 #define SCNoFAST64  "llo"
 
-#define SCNoMAX     "llo"
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
@@ -221,7 +212,6 @@
 #define SCNuFAST32  "u"
 #define SCNuFAST64  "llu"
 
-#define SCNuMAX     "llu"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -239,7 +229,6 @@
 #define SCNxFAST32  "x"
 #define SCNxFAST64  "llx"
 
-#define SCNxMAX     "llx"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/arch/hc/include/inttypes.h b/arch/hc/include/inttypes.h
index ef227d7..111c806 100644
--- a/arch/hc/include/inttypes.h
+++ b/arch/hc/include/inttypes.h
@@ -61,7 +61,6 @@
 #  define PRIdFAST32  "ld"
 #  define PRIdFAST64  "lld"
 
-#  define PRIdMAX     "lld"
 #  define PRIdPTR     "d"
 
 #  define PRIi8       "i"
@@ -79,7 +78,6 @@
 #  define PRIiFAST32  "li"
 #  define PRIiFAST64  "lli"
 
-#  define PRIiMAX     "lli"
 #  define PRIiPTR     "i"
 
 #  define PRIo8       "o"
@@ -97,7 +95,6 @@
 #  define PRIoFAST32  "lo"
 #  define PRIoFAST64  "llo"
 
-#  define PRIoMAX     "llo"
 #  define PRIoPTR     "o"
 
 #  define PRIu8       "u"
@@ -115,7 +112,6 @@
 #  define PRIuFAST32  "lu"
 #  define PRIuFAST64  "llu"
 
-#  define PRIuMAX     "llu"
 #  define PRIuPTR     "u"
 
 #  define PRIx8       "x"
@@ -133,7 +129,6 @@
 #  define PRIxFAST32  "lx"
 #  define PRIxFAST64  "llx"
 
-#  define PRIxMAX     "llx"
 #  define PRIxPTR     "x"
 
 #  define PRIX8       "X"
@@ -151,7 +146,6 @@
 #  define PRIXFAST32  "lX"
 #  define PRIXFAST64  "llX"
 
-#  define PRIXMAX     "llX"
 #  define PRIXPTR     "X"
 
 #  define SCNd8       "hhd"
@@ -169,7 +163,6 @@
 #  define SCNdFAST32  "ld"
 #  define SCNdFAST64  "lld"
 
-#  define SCNdMAX     "lld"
 #  define SCNdPTR     "d"
 
 #  define SCNi8       "hhi"
@@ -187,7 +180,6 @@
 #  define SCNiFAST32  "li"
 #  define SCNiFAST64  "lli"
 
-#  define SCNiMAX     "lli"
 #  define SCNiPTR     "i"
 
 #  define SCNo8       "hho"
@@ -205,7 +197,6 @@
 #  define SCNoFAST32  "lo"
 #  define SCNoFAST64  "llo"
 
-#  define SCNoMAX     "llo"
 #  define SCNoPTR     "o"
 
 #  define SCNu8       "hhu"
@@ -223,7 +214,6 @@
 #  define SCNuFAST32  "lu"
 #  define SCNuFAST64  "llu"
 
-#  define SCNuMAX     "llu"
 #  define SCNuPTR     "u"
 
 #  define SCNx8       "hhx"
@@ -241,7 +231,6 @@
 #  define SCNxFAST32  "lx"
 #  define SCNxFAST64  "llx"
 
-#  define SCNxMAX     "llx"
 #  define SCNxPTR     "x"
 
 #  define INT8_C(x)   x
@@ -271,7 +260,6 @@
 #  define PRIdFAST32  "d"
 #  define PRIdFAST64  "lld"
 
-#  define PRIdMAX     "lld"
 #  define PRIdPTR     "d"
 
 #  define PRIi8       "i"
@@ -289,7 +277,6 @@
 #  define PRIiFAST32  "i"
 #  define PRIiFAST64  "lli"
 
-#  define PRIiMAX     "lli"
 #  define PRIiPTR     "i"
 
 #  define PRIo8       "o"
@@ -307,7 +294,6 @@
 #  define PRIoFAST32  "o"
 #  define PRIoFAST64  "llo"
 
-#  define PRIoMAX     "llo"
 #  define PRIoPTR     "o"
 
 #  define PRIu8       "u"
@@ -325,7 +311,6 @@
 #  define PRIuFAST32  "u"
 #  define PRIuFAST64  "llu"
 
-#  define PRIuMAX     "llu"
 #  define PRIuPTR     "u"
 
 #  define PRIx8       "x"
@@ -343,7 +328,6 @@
 #  define PRIxFAST32  "x"
 #  define PRIxFAST64  "llx"
 
-#  define PRIxMAX     "llx"
 #  define PRIxPTR     "x"
 
 #  define PRIX8       "X"
@@ -361,7 +345,6 @@
 #  define PRIXFAST32  "X"
 #  define PRIXFAST64  "llX"
 
-#  define PRIXMAX     "llX"
 #  define PRIXPTR     "X"
 
 #  define SCNd8       "hhd"
@@ -379,7 +362,6 @@
 #  define SCNdFAST32  "d"
 #  define SCNdFAST64  "lld"
 
-#  define SCNdMAX     "lld"
 #  define SCNdPTR     "d"
 
 #  define SCNi8       "hhi"
@@ -397,7 +379,6 @@
 #  define SCNiFAST32  "i"
 #  define SCNiFAST64  "lli"
 
-#  define SCNiMAX     "lli"
 #  define SCNiPTR     "i"
 
 #  define SCNo8       "hho"
@@ -415,7 +396,6 @@
 #  define SCNoFAST32  "o"
 #  define SCNoFAST64  "llo"
 
-#  define SCNoMAX     "llo"
 #  define SCNoPTR     "o"
 
 #  define SCNu8       "hhu"
@@ -433,7 +413,6 @@
 #  define SCNuFAST32  "u"
 #  define SCNuFAST64  "llu"
 
-#  define SCNuMAX     "llu"
 #  define SCNuPTR     "u"
 
 #  define SCNx8       "hhx"
@@ -451,7 +430,6 @@
 #  define SCNxFAST32  "x"
 #  define SCNxFAST64  "llx"
 
-#  define SCNxMAX     "llx"
 #  define SCNxPTR     "x"
 
 #  define INT8_C(x)   x
diff --git a/arch/mips/include/inttypes.h b/arch/mips/include/inttypes.h
index 720a248..7dfec76 100644
--- a/arch/mips/include/inttypes.h
+++ b/arch/mips/include/inttypes.h
@@ -59,7 +59,6 @@
 #define PRIdFAST32  "d"
 #define PRIdFAST64  "lld"
 
-#define PRIdMAX     "lld"
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
@@ -77,7 +76,6 @@
 #define PRIiFAST32  "i"
 #define PRIiFAST64  "lli"
 
-#define PRIiMAX     "lli"
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
@@ -95,7 +93,6 @@
 #define PRIoFAST32  "o"
 #define PRIoFAST64  "llo"
 
-#define PRIoMAX     "llo"
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
@@ -113,7 +110,6 @@
 #define PRIuFAST32  "u"
 #define PRIuFAST64  "llu"
 
-#define PRIuMAX     "llu"
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
@@ -131,7 +127,6 @@
 #define PRIxFAST32  "x"
 #define PRIxFAST64  "llx"
 
-#define PRIxMAX     "llx"
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
@@ -149,7 +144,6 @@
 #define PRIXFAST32  "X"
 #define PRIXFAST64  "llX"
 
-#define PRIXMAX     "llX"
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
@@ -167,7 +161,6 @@
 #define SCNdFAST32  "d"
 #define SCNdFAST64  "lld"
 
-#define SCNdMAX     "lld"
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
@@ -185,7 +178,6 @@
 #define SCNiFAST32  "i"
 #define SCNiFAST64  "lli"
 
-#define SCNiMAX     "lli"
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
@@ -203,7 +195,6 @@
 #define SCNoFAST32  "o"
 #define SCNoFAST64  "llo"
 
-#define SCNoMAX     "llo"
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
@@ -221,7 +212,6 @@
 #define SCNuFAST32  "u"
 #define SCNuFAST64  "llu"
 
-#define SCNuMAX     "llu"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -239,7 +229,6 @@
 #define SCNxFAST32  "x"
 #define SCNxFAST64  "llx"
 
-#define SCNxMAX     "llx"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/arch/misoc/include/inttypes.h b/arch/misoc/include/inttypes.h
index 022d8c3..6b6cb70 100644
--- a/arch/misoc/include/inttypes.h
+++ b/arch/misoc/include/inttypes.h
@@ -59,7 +59,6 @@
 #define PRIdFAST32  "d"
 #define PRIdFAST64  "lld"
 
-#define PRIdMAX     "lld"
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
@@ -77,7 +76,6 @@
 #define PRIiFAST32  "i"
 #define PRIiFAST64  "lli"
 
-#define PRIiMAX     "lli"
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
@@ -95,7 +93,6 @@
 #define PRIoFAST32  "o"
 #define PRIoFAST64  "llo"
 
-#define PRIoMAX     "llo"
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
@@ -113,7 +110,6 @@
 #define PRIuFAST32  "u"
 #define PRIuFAST64  "llu"
 
-#define PRIuMAX     "llu"
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
@@ -131,7 +127,6 @@
 #define PRIxFAST32  "x"
 #define PRIxFAST64  "llx"
 
-#define PRIxMAX     "llx"
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
@@ -149,7 +144,6 @@
 #define PRIXFAST32  "X"
 #define PRIXFAST64  "llX"
 
-#define PRIXMAX     "llX"
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
@@ -167,7 +161,6 @@
 #define SCNdFAST32  "d"
 #define SCNdFAST64  "lld"
 
-#define SCNdMAX     "lld"
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
@@ -185,7 +178,6 @@
 #define SCNiFAST32  "i"
 #define SCNiFAST64  "lli"
 
-#define SCNiMAX     "lli"
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
@@ -203,7 +195,6 @@
 #define SCNoFAST32  "o"
 #define SCNoFAST64  "llo"
 
-#define SCNoMAX     "llo"
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
@@ -221,7 +212,6 @@
 #define SCNuFAST32  "u"
 #define SCNuFAST64  "llu"
 
-#define SCNuMAX     "llu"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -239,7 +229,6 @@
 #define SCNxFAST32  "x"
 #define SCNxFAST64  "llx"
 
-#define SCNxMAX     "llx"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/arch/or1k/include/inttypes.h b/arch/or1k/include/inttypes.h
index 1df9608..4438a8a 100644
--- a/arch/or1k/include/inttypes.h
+++ b/arch/or1k/include/inttypes.h
@@ -59,7 +59,6 @@
 #define PRIdFAST32  "d"
 #define PRIdFAST64  "lld"
 
-#define PRIdMAX     "lld"
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
@@ -77,7 +76,6 @@
 #define PRIiFAST32  "i"
 #define PRIiFAST64  "lli"
 
-#define PRIiMAX     "lli"
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
@@ -95,7 +93,6 @@
 #define PRIoFAST32  "o"
 #define PRIoFAST64  "llo"
 
-#define PRIoMAX     "llo"
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
@@ -113,7 +110,6 @@
 #define PRIuFAST32  "u"
 #define PRIuFAST64  "llu"
 
-#define PRIuMAX     "llu"
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
@@ -131,7 +127,6 @@
 #define PRIxFAST32  "x"
 #define PRIxFAST64  "llx"
 
-#define PRIxMAX     "llx"
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
@@ -149,7 +144,6 @@
 #define PRIXFAST32  "X"
 #define PRIXFAST64  "llX"
 
-#define PRIXMAX     "llX"
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
@@ -167,7 +161,6 @@
 #define SCNdFAST32  "d"
 #define SCNdFAST64  "lld"
 
-#define SCNdMAX     "lld"
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
@@ -185,7 +178,6 @@
 #define SCNiFAST32  "i"
 #define SCNiFAST64  "lli"
 
-#define SCNiMAX     "lli"
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
@@ -203,7 +195,6 @@
 #define SCNoFAST32  "o"
 #define SCNoFAST64  "llo"
 
-#define SCNoMAX     "llo"
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
@@ -221,7 +212,6 @@
 #define SCNuFAST32  "u"
 #define SCNuFAST64  "llu"
 
-#define SCNuMAX     "llu"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -239,7 +229,6 @@
 #define SCNxFAST32  "x"
 #define SCNxFAST64  "llx"
 
-#define SCNxMAX     "llx"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/arch/renesas/include/m16c/inttypes.h b/arch/renesas/include/m16c/inttypes.h
index 4cbb63e..48ffb5c 100644
--- a/arch/renesas/include/m16c/inttypes.h
+++ b/arch/renesas/include/m16c/inttypes.h
@@ -59,7 +59,6 @@
 #define PRIdFAST32  "ld"
 #define PRIdFAST64  "lld"
 
-#define PRIdMAX     "lld"
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
@@ -77,7 +76,6 @@
 #define PRIiFAST32  "li"
 #define PRIiFAST64  "lli"
 
-#define PRIiMAX     "lli"
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
@@ -95,7 +93,6 @@
 #define PRIoFAST32  "lo"
 #define PRIoFAST64  "llo"
 
-#define PRIoMAX     "llo"
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
@@ -113,7 +110,6 @@
 #define PRIuFAST32  "lu"
 #define PRIuFAST64  "llu"
 
-#define PRIuMAX     "llu"
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
@@ -131,7 +127,6 @@
 #define PRIxFAST32  "lx"
 #define PRIxFAST64  "llx"
 
-#define PRIxMAX     "llx"
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
@@ -149,7 +144,6 @@
 #define PRIXFAST32  "lX"
 #define PRIXFAST64  "llX"
 
-#define PRIXMAX     "llX"
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
@@ -167,7 +161,6 @@
 #define SCNdFAST32  "ld"
 #define SCNdFAST64  "lld"
 
-#define SCNdMAX     "lld"
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
@@ -185,7 +178,6 @@
 #define SCNiFAST32  "li"
 #define SCNiFAST64  "lli"
 
-#define SCNiMAX     "lli"
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
@@ -203,7 +195,6 @@
 #define SCNoFAST32  "lo"
 #define SCNoFAST64  "llo"
 
-#define SCNoMAX     "llo"
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
@@ -221,7 +212,6 @@
 #define SCNuFAST32  "lu"
 #define SCNuFAST64  "llu"
 
-#define SCNuMAX     "llu"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -239,7 +229,6 @@
 #define SCNxFAST32  "lx"
 #define SCNxFAST64  "llx"
 
-#define SCNxMAX     "llx"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/arch/renesas/include/rx65n/inttypes.h b/arch/renesas/include/rx65n/inttypes.h
index 29f727a..400d36b 100644
--- a/arch/renesas/include/rx65n/inttypes.h
+++ b/arch/renesas/include/rx65n/inttypes.h
@@ -54,7 +54,6 @@
 #define PRIdFAST32  "d"
 #define PRIdFAST64  "lld"
 
-#define PRIdMAX     "lld"
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
@@ -72,7 +71,6 @@
 #define PRIiFAST32  "i"
 #define PRIiFAST64  "lli"
 
-#define PRIiMAX     "lli"
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
@@ -90,7 +88,6 @@
 #define PRIoFAST32  "o"
 #define PRIoFAST64  "llo"
 
-#define PRIoMAX     "llo"
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
@@ -108,7 +105,6 @@
 #define PRIuFAST32  "u"
 #define PRIuFAST64  "llu"
 
-#define PRIuMAX     "llu"
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
@@ -126,7 +122,6 @@
 #define PRIxFAST32  "x"
 #define PRIxFAST64  "llx"
 
-#define PRIxMAX     "llx"
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
@@ -144,7 +139,6 @@
 #define PRIXFAST32  "X"
 #define PRIXFAST64  "llX"
 
-#define PRIXMAX     "llX"
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
@@ -162,7 +156,6 @@
 #define SCNdFAST32  "d"
 #define SCNdFAST64  "lld"
 
-#define SCNdMAX     "lld"
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
@@ -180,7 +173,6 @@
 #define SCNiFAST32  "i"
 #define SCNiFAST64  "lli"
 
-#define SCNiMAX     "lli"
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
@@ -198,7 +190,6 @@
 #define SCNoFAST32  "o"
 #define SCNoFAST64  "llo"
 
-#define SCNoMAX     "llo"
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
@@ -216,7 +207,6 @@
 #define SCNuFAST32  "u"
 #define SCNuFAST64  "llu"
 
-#define SCNuMAX     "llu"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -234,7 +224,6 @@
 #define SCNxFAST32  "x"
 #define SCNxFAST64  "llx"
 
-#define SCNxMAX     "llx"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/arch/renesas/include/sh1/inttypes.h b/arch/renesas/include/sh1/inttypes.h
index d1f740e..e60adf6 100644
--- a/arch/renesas/include/sh1/inttypes.h
+++ b/arch/renesas/include/sh1/inttypes.h
@@ -59,7 +59,6 @@
 #define PRIdFAST32  "d"
 #define PRIdFAST64  "lld"
 
-#define PRIdMAX     "lld"
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
@@ -77,7 +76,6 @@
 #define PRIiFAST32  "i"
 #define PRIiFAST64  "lli"
 
-#define PRIiMAX     "lli"
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
@@ -95,7 +93,6 @@
 #define PRIoFAST32  "o"
 #define PRIoFAST64  "llo"
 
-#define PRIoMAX     "llo"
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
@@ -113,7 +110,6 @@
 #define PRIuFAST32  "u"
 #define PRIuFAST64  "llu"
 
-#define PRIuMAX     "llu"
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
@@ -131,7 +127,6 @@
 #define PRIxFAST32  "x"
 #define PRIxFAST64  "llx"
 
-#define PRIxMAX     "llx"
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
@@ -149,7 +144,6 @@
 #define PRIXFAST32  "X"
 #define PRIXFAST64  "llX"
 
-#define PRIXMAX     "llX"
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
@@ -167,7 +161,6 @@
 #define SCNdFAST32  "d"
 #define SCNdFAST64  "lld"
 
-#define SCNdMAX     "lld"
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
@@ -185,7 +178,6 @@
 #define SCNiFAST32  "i"
 #define SCNiFAST64  "lli"
 
-#define SCNiMAX     "lli"
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
@@ -203,7 +195,6 @@
 #define SCNoFAST32  "o"
 #define SCNoFAST64  "llo"
 
-#define SCNoMAX     "llo"
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
@@ -221,7 +212,6 @@
 #define SCNuFAST32  "u"
 #define SCNuFAST64  "llu"
 
-#define SCNuMAX     "llu"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -239,7 +229,6 @@
 #define SCNxFAST32  "x"
 #define SCNxFAST64  "llx"
 
-#define SCNxMAX     "llx"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/arch/risc-v/include/inttypes.h b/arch/risc-v/include/inttypes.h
index 4414c41..e62c676 100644
--- a/arch/risc-v/include/inttypes.h
+++ b/arch/risc-v/include/inttypes.h
@@ -59,7 +59,6 @@
 #define PRIdFAST32  "d"
 #define PRIdFAST64  "lld"
 
-#define PRIdMAX     "lld"
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
@@ -77,7 +76,6 @@
 #define PRIiFAST32  "i"
 #define PRIiFAST64  "lli"
 
-#define PRIiMAX     "lli"
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
@@ -95,7 +93,6 @@
 #define PRIoFAST32  "o"
 #define PRIoFAST64  "llo"
 
-#define PRIoMAX     "llo"
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
@@ -113,7 +110,6 @@
 #define PRIuFAST32  "u"
 #define PRIuFAST64  "llu"
 
-#define PRIuMAX     "llu"
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
@@ -131,7 +127,6 @@
 #define PRIxFAST32  "x"
 #define PRIxFAST64  "llx"
 
-#define PRIxMAX     "llx"
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
@@ -149,7 +144,6 @@
 #define PRIXFAST32  "X"
 #define PRIXFAST64  "llX"
 
-#define PRIXMAX     "llX"
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
@@ -167,7 +161,6 @@
 #define SCNdFAST32  "d"
 #define SCNdFAST64  "lld"
 
-#define SCNdMAX     "lld"
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
@@ -185,7 +178,6 @@
 #define SCNiFAST32  "i"
 #define SCNiFAST64  "lli"
 
-#define SCNiMAX     "lli"
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
@@ -203,7 +195,6 @@
 #define SCNoFAST32  "o"
 #define SCNoFAST64  "llo"
 
-#define SCNoMAX     "llo"
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
@@ -221,7 +212,6 @@
 #define SCNuFAST32  "u"
 #define SCNuFAST64  "llu"
 
-#define SCNuMAX     "llu"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -239,7 +229,6 @@
 #define SCNxFAST32  "x"
 #define SCNxFAST64  "llx"
 
-#define SCNxMAX     "llx"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/arch/sim/include/inttypes.h b/arch/sim/include/inttypes.h
index 34ca5de..33061e6 100644
--- a/arch/sim/include/inttypes.h
+++ b/arch/sim/include/inttypes.h
@@ -61,7 +61,6 @@
 #  define PRIdFAST32  "d"
 #  define PRIdFAST64  "lld"
 
-#  define PRIdMAX     "lld"
 #  define PRIdPTR     "lld"
 
 #  define PRIi8       "i"
@@ -79,7 +78,6 @@
 #  define PRIiFAST32  "i"
 #  define PRIiFAST64  "lli"
 
-#  define PRIiMAX     "lli"
 #  define PRIiPTR     "lli"
 
 #  define PRIo8       "o"
@@ -97,7 +95,6 @@
 #  define PRIoFAST32  "o"
 #  define PRIoFAST64  "llo"
 
-#  define PRIoMAX     "llo"
 #  define PRIoPTR     "llo"
 
 #  define PRIu8       "u"
@@ -133,7 +130,6 @@
 #  define PRIxFAST32  "x"
 #  define PRIxFAST64  "llx"
 
-#  define PRIxMAX     "llx"
 #  define PRIxPTR     "llx"
 
 #  define PRIX8       "X"
@@ -151,7 +147,6 @@
 #  define PRIXFAST32  "X"
 #  define PRIXFAST64  "llX"
 
-#  define PRIXMAX     "llX"
 #  define PRIXPTR     "llX"
 
 #  define SCNd8       "hhd"
@@ -223,7 +218,6 @@
 #  define SCNuFAST32  "u"
 #  define SCNuFAST64  "llu"
 
-#  define SCNuMAX     "llu"
 #  define SCNuPTR     "llu"
 
 #  define SCNx8       "hhx"
@@ -241,7 +235,6 @@
 #  define SCNxFAST32  "x"
 #  define SCNxFAST64  "llx"
 
-#  define SCNxMAX     "llx"
 #  define SCNxPTR     "llx"
 
 #  define INT8_C(x)   x
@@ -271,7 +264,6 @@
 #  define PRIdFAST32  "d"
 #  define PRIdFAST64  "lld"
 
-#  define PRIdMAX     "lld"
 #  define PRIdPTR     "d"
 
 #  define PRIi8       "i"
@@ -289,7 +281,6 @@
 #  define PRIiFAST32  "i"
 #  define PRIiFAST64  "lli"
 
-#  define PRIiMAX     "lli"
 #  define PRIiPTR     "i"
 
 #  define PRIo8       "o"
@@ -307,7 +298,6 @@
 #  define PRIoFAST32  "o"
 #  define PRIoFAST64  "llo"
 
-#  define PRIoMAX     "llo"
 #  define PRIoPTR     "o"
 
 #  define PRIu8       "u"
@@ -343,7 +333,6 @@
 #  define PRIxFAST32  "x"
 #  define PRIxFAST64  "llx"
 
-#  define PRIxMAX     "llx"
 #  define PRIxPTR     "x"
 
 #  define PRIX8       "X"
@@ -361,7 +350,6 @@
 #  define PRIXFAST32  "X"
 #  define PRIXFAST64  "llX"
 
-#  define PRIXMAX     "llX"
 #  define PRIXPTR     "X"
 
 #  define SCNd8       "hhd"
@@ -433,7 +421,6 @@
 #  define SCNuFAST32  "u"
 #  define SCNuFAST64  "llu"
 
-#  define SCNuMAX     "llu"
 #  define SCNuPTR     "u"
 
 #  define SCNx8       "hhx"
@@ -451,7 +438,6 @@
 #  define SCNxFAST32  "x"
 #  define SCNxFAST64  "llx"
 
-#  define SCNxMAX     "llx"
 #  define SCNxPTR     "x"
 
 #  define INT8_C(x)   x
diff --git a/arch/x86/include/i486/inttypes.h b/arch/x86/include/i486/inttypes.h
index 0a02cd8..04eb657 100644
--- a/arch/x86/include/i486/inttypes.h
+++ b/arch/x86/include/i486/inttypes.h
@@ -59,7 +59,6 @@
 #define PRIdFAST32  "d"
 #define PRIdFAST64  "lld"
 
-#define PRIdMAX     "lld"
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
@@ -77,7 +76,6 @@
 #define PRIiFAST32  "i"
 #define PRIiFAST64  "lli"
 
-#define PRIiMAX     "lli"
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
@@ -95,7 +93,6 @@
 #define PRIoFAST32  "o"
 #define PRIoFAST64  "llo"
 
-#define PRIoMAX     "llo"
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
@@ -113,7 +110,6 @@
 #define PRIuFAST32  "u"
 #define PRIuFAST64  "llu"
 
-#define PRIuMAX     "llu"
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
@@ -131,7 +127,6 @@
 #define PRIxFAST32  "x"
 #define PRIxFAST64  "llx"
 
-#define PRIxMAX     "llx"
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
@@ -149,7 +144,6 @@
 #define PRIXFAST32  "X"
 #define PRIXFAST64  "llX"
 
-#define PRIXMAX     "llX"
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
@@ -167,7 +161,6 @@
 #define SCNdFAST32  "d"
 #define SCNdFAST64  "lld"
 
-#define SCNdMAX     "lld"
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
@@ -185,7 +178,6 @@
 #define SCNiFAST32  "i"
 #define SCNiFAST64  "lli"
 
-#define SCNiMAX     "lli"
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
@@ -203,7 +195,6 @@
 #define SCNoFAST32  "o"
 #define SCNoFAST64  "llo"
 
-#define SCNoMAX     "llo"
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
@@ -221,7 +212,6 @@
 #define SCNuFAST32  "u"
 #define SCNuFAST64  "llu"
 
-#define SCNuMAX     "llu"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -239,7 +229,6 @@
 #define SCNxFAST32  "x"
 #define SCNxFAST64  "llx"
 
-#define SCNxMAX     "llx"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/arch/x86_64/include/intel64/inttypes.h b/arch/x86_64/include/intel64/inttypes.h
index 5384e5b..e621124 100644
--- a/arch/x86_64/include/intel64/inttypes.h
+++ b/arch/x86_64/include/intel64/inttypes.h
@@ -44,7 +44,6 @@
 #define PRIdFAST32  "d"
 #define PRIdFAST64  "lld"
 
-#define PRIdMAX     "lld"
 #define PRIdPTR     "lld"
 
 #define PRIi8       "i"
@@ -62,7 +61,6 @@
 #define PRIiFAST32  "i"
 #define PRIiFAST64  "lli"
 
-#define PRIiMAX     "lli"
 #define PRIiPTR     "lli"
 
 #define PRIo8       "o"
@@ -80,7 +78,6 @@
 #define PRIoFAST32  "o"
 #define PRIoFAST64  "llo"
 
-#define PRIoMAX     "llo"
 #define PRIoPTR     "llo"
 
 #define PRIu8       "u"
@@ -98,7 +95,6 @@
 #define PRIuFAST32  "u"
 #define PRIuFAST64  "llu"
 
-#define PRIuMAX     "llu"
 #define PRIuPTR     "llu"
 
 #define PRIx8       "x"
@@ -116,7 +112,6 @@
 #define PRIxFAST32  "x"
 #define PRIxFAST64  "llx"
 
-#define PRIxMAX     "llx"
 #define PRIxPTR     "llx"
 
 #define PRIX8       "X"
@@ -134,7 +129,6 @@
 #define PRIXFAST32  "X"
 #define PRIXFAST64  "llX"
 
-#define PRIXMAX     "llX"
 #define PRIXPTR     "llX"
 
 #define SCNd8       "hhd"
@@ -152,7 +146,6 @@
 #define SCNdFAST32  "d"
 #define SCNdFAST64  "lld"
 
-#define SCNdMAX     "lld"
 #define SCNdPTR     "lld"
 
 #define SCNi8       "hhi"
@@ -170,7 +163,6 @@
 #define SCNiFAST32  "i"
 #define SCNiFAST64  "lli"
 
-#define SCNiMAX     "lli"
 #define SCNiPTR     "lli"
 
 #define SCNo8       "hho"
@@ -188,7 +180,6 @@
 #define SCNoFAST32  "o"
 #define SCNoFAST64  "llo"
 
-#define SCNoMAX     "llo"
 #define SCNoPTR     "llo"
 
 #define SCNu8       "hhu"
@@ -206,7 +197,6 @@
 #define SCNuFAST32  "u"
 #define SCNuFAST64  "llu"
 
-#define SCNuMAX     "llu"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -224,7 +214,6 @@
 #define SCNxFAST32  "x"
 #define SCNxFAST64  "llx"
 
-#define SCNxMAX     "llx"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/arch/xtensa/include/inttypes.h b/arch/xtensa/include/inttypes.h
index 9037838..ff5b620 100644
--- a/arch/xtensa/include/inttypes.h
+++ b/arch/xtensa/include/inttypes.h
@@ -59,7 +59,6 @@
 #define PRIdFAST32  "d"
 #define PRIdFAST64  "lld"
 
-#define PRIdMAX     "lld"
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
@@ -77,7 +76,6 @@
 #define PRIiFAST32  "i"
 #define PRIiFAST64  "lli"
 
-#define PRIiMAX     "lli"
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
@@ -95,7 +93,6 @@
 #define PRIoFAST32  "o"
 #define PRIoFAST64  "llo"
 
-#define PRIoMAX     "llo"
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
@@ -113,7 +110,6 @@
 #define PRIuFAST32  "u"
 #define PRIuFAST64  "llu"
 
-#define PRIuMAX     "llu"
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
@@ -131,7 +127,6 @@
 #define PRIxFAST32  "x"
 #define PRIxFAST64  "llx"
 
-#define PRIxMAX     "llx"
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
@@ -149,7 +144,6 @@
 #define PRIXFAST32  "X"
 #define PRIXFAST64  "llX"
 
-#define PRIXMAX     "llX"
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
@@ -167,7 +161,6 @@
 #define SCNdFAST32  "d"
 #define SCNdFAST64  "lld"
 
-#define SCNdMAX     "lld"
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
@@ -185,7 +178,6 @@
 #define SCNiFAST32  "i"
 #define SCNiFAST64  "lli"
 
-#define SCNiMAX     "lli"
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
@@ -203,7 +195,6 @@
 #define SCNoFAST32  "o"
 #define SCNoFAST64  "llo"
 
-#define SCNoMAX     "llo"
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
@@ -221,7 +212,6 @@
 #define SCNuFAST32  "u"
 #define SCNuFAST64  "llu"
 
-#define SCNuMAX     "llu"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -239,7 +229,6 @@
 #define SCNxFAST32  "x"
 #define SCNxFAST64  "llx"
 
-#define SCNxMAX     "llx"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/arch/z16/include/inttypes.h b/arch/z16/include/inttypes.h
index 538f24d..e6dc9c8 100644
--- a/arch/z16/include/inttypes.h
+++ b/arch/z16/include/inttypes.h
@@ -56,7 +56,6 @@
 #define PRIdFAST16  "d"
 #define PRIdFAST32  "d"
 
-#define PRIdMAX     "d"
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
@@ -71,7 +70,6 @@
 #define PRIiFAST16  "i"
 #define PRIiFAST32  "i"
 
-#define PRIiMAX     "i"
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
@@ -86,7 +84,6 @@
 #define PRIoFAST16  "o"
 #define PRIoFAST32  "o"
 
-#define PRIoMAX     "o"
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
@@ -101,7 +98,6 @@
 #define PRIuFAST16  "u"
 #define PRIuFAST32  "u"
 
-#define PRIuMAX     "u"
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
@@ -116,7 +112,6 @@
 #define PRIxFAST16  "x"
 #define PRIxFAST32  "x"
 
-#define PRIxMAX     "x"
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
@@ -131,7 +126,6 @@
 #define PRIXFAST16  "X"
 #define PRIXFAST32  "X"
 
-#define PRIXMAX     "X"
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
@@ -146,7 +140,6 @@
 #define SCNdFAST16  "hd"
 #define SCNdFAST32  "d"
 
-#define SCNdMAX     "d"
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
@@ -161,7 +154,6 @@
 #define SCNiFAST16  "hi"
 #define SCNiFAST32  "i"
 
-#define SCNiMAX     "i"
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
@@ -176,7 +168,6 @@
 #define SCNoFAST16  "ho"
 #define SCNoFAST32  "o"
 
-#define SCNoMAX     "o"
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
@@ -191,7 +182,6 @@
 #define SCNuFAST16  "hu"
 #define SCNuFAST32  "u"
 
-#define SCNuMAX     "u"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -206,7 +196,6 @@
 #define SCNxFAST16  "hx"
 #define SCNxFAST32  "x"
 
-#define SCNxMAX     "x"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/arch/z80/include/ez80/inttypes.h b/arch/z80/include/ez80/inttypes.h
index 7779b4a..9b82518 100644
--- a/arch/z80/include/ez80/inttypes.h
+++ b/arch/z80/include/ez80/inttypes.h
@@ -58,7 +58,6 @@
 #  define PRIdFAST16  "d"
 #  define PRIdFAST32  "ld"
 
-#  define PRIdMAX     "ld"
 #  define PRIdPTR     "d"
 
 #  define PRIi8       "i"
@@ -73,7 +72,6 @@
 #  define PRIiFAST16  "i"
 #  define PRIiFAST32  "li"
 
-#  define PRIiMAX     "li"
 #  define PRIiPTR     "i"
 
 #  define PRIo8       "o"
@@ -88,7 +86,6 @@
 #  define PRIoFAST16  "o"
 #  define PRIoFAST32  "lo"
 
-#  define PRIoMAX     "lo"
 #  define PRIoPTR     "o"
 
 #  define PRIu8       "u"
@@ -103,7 +100,6 @@
 #  define PRIuFAST16  "u"
 #  define PRIuFAST32  "lu"
 
-#  define PRIuMAX     "lu"
 #  define PRIuPTR     "u"
 
 #  define PRIx8       "x"
@@ -118,7 +114,6 @@
 #  define PRIxFAST16  "x"
 #  define PRIxFAST32  "lx"
 
-#  define PRIxMAX     "lx"
 #  define PRIxPTR     "x"
 
 #  define PRIX8       "X"
@@ -133,7 +128,6 @@
 #  define PRIXFAST16  "X"
 #  define PRIXFAST32  "lX"
 
-#  define PRIXMAX     "lX"
 #  define PRIXPTR     "X"
 
 #  define SCNd8       "hhd"
@@ -148,7 +142,6 @@
 #  define SCNdFAST16  "hd"
 #  define SCNdFAST32  "ld"
 
-#  define SCNdMAX     "ld"
 #  define SCNdPTR     "hd"
 
 #  define SCNi8       "hhi"
@@ -163,7 +156,6 @@
 #  define SCNiFAST16  "hi"
 #  define SCNiFAST32  "li"
 
-#  define SCNiMAX     "li"
 #  define SCNiPTR     "hi"
 
 #  define SCNo8       "hho"
@@ -178,7 +170,6 @@
 #  define SCNoFAST16  "ho"
 #  define SCNoFAST32  "lo"
 
-#  define SCNoMAX     "lo"
 #  define SCNoPTR     "ho"
 
 #  define SCNu8       "hhu"
@@ -193,7 +184,6 @@
 #  define SCNuFAST16  "hu"
 #  define SCNuFAST32  "lu"
 
-#  define SCNuMAX     "lu"
 #  define SCNuPTR     "hu"
 
 #  define SCNx8       "hhx"
@@ -208,7 +198,6 @@
 #  define SCNxFAST16  "hx"
 #  define SCNxFAST32  "lx"
 
-#  define SCNxMAX     "lx"
 #  define SCNxPTR     "hx"
 
 #  define INT8_C(x)   x
@@ -233,7 +222,6 @@
 #  define PRIdFAST16  "d"
 #  define PRIdFAST32  "ld"
 
-#  define PRIdMAX     "ld"
 #  define PRIdPTR     "d"
 
 #  define PRIi8       "i"
@@ -248,7 +236,6 @@
 #  define PRIiFAST16  "i"
 #  define PRIiFAST32  "li"
 
-#  define PRIiMAX     "li"
 #  define PRIiPTR     "i"
 
 #  define PRIo8       "o"
@@ -263,7 +250,6 @@
 #  define PRIoFAST16  "o"
 #  define PRIoFAST32  "lo"
 
-#  define PRIoMAX     "lo"
 #  define PRIoPTR     "o"
 
 #  define PRIu8       "u"
@@ -278,7 +264,6 @@
 #  define PRIuFAST16  "u"
 #  define PRIuFAST32  "lu"
 
-#  define PRIuMAX     "lu"
 #  define PRIuPTR     "u"
 
 #  define PRIx8       "x"
@@ -293,7 +278,6 @@
 #  define PRIxFAST16  "x"
 #  define PRIxFAST32  "lx"
 
-#  define PRIxMAX     "lx"
 #  define PRIxPTR     "x"
 
 #  define PRIX8       "X"
@@ -308,7 +292,6 @@
 #  define PRIXFAST16  "X"
 #  define PRIXFAST32  "lX"
 
-#  define PRIXMAX     "lX"
 #  define PRIXPTR     "X"
 
 #  define SCNd8       "hhd"
@@ -323,7 +306,6 @@
 #  define SCNdFAST16  "hd"
 #  define SCNdFAST32  "ld"
 
-#  define SCNdMAX     "ld"
 #  define SCNdPTR     "d"
 
 #  define SCNi8       "hhi"
@@ -338,7 +320,6 @@
 #  define SCNiFAST16  "hi"
 #  define SCNiFAST32  "li"
 
-#  define SCNiMAX     "li"
 #  define SCNiPTR     "i"
 
 #  define SCNo8       "hho"
@@ -353,7 +334,6 @@
 #  define SCNoFAST16  "ho"
 #  define SCNoFAST32  "lo"
 
-#  define SCNoMAX     "lo"
 #  define SCNoPTR     "o"
 
 #  define SCNu8       "hhu"
@@ -368,7 +348,6 @@
 #  define SCNuFAST16  "hu"
 #  define SCNuFAST32  "lu"
 
-#  define SCNuMAX     "lu"
 #  define SCNuPTR     "u"
 
 #  define SCNx8       "hhx"
@@ -383,7 +362,6 @@
 #  define SCNxFAST16  "hx"
 #  define SCNxFAST32  "lx"
 
-#  define SCNxMAX     "lx"
 #  define SCNxPTR     "x"
 
 #  define INT8_C(x)   x
diff --git a/arch/z80/include/z180/inttypes.h b/arch/z80/include/z180/inttypes.h
index 124b1ec..67f988b 100644
--- a/arch/z80/include/z180/inttypes.h
+++ b/arch/z80/include/z180/inttypes.h
@@ -56,7 +56,6 @@
 #define PRIdFAST16  "d"
 #define PRIdFAST32  "ld"
 
-#define PRIdMAX     "ld"
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
@@ -71,7 +70,6 @@
 #define PRIiFAST16  "i"
 #define PRIiFAST32  "li"
 
-#define PRIiMAX     "li"
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
@@ -86,7 +84,6 @@
 #define PRIoFAST16  "o"
 #define PRIoFAST32  "lo"
 
-#define PRIoMAX     "lo"
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
@@ -101,7 +98,6 @@
 #define PRIuFAST16  "u"
 #define PRIuFAST32  "lu"
 
-#define PRIuMAX     "lu"
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
@@ -116,7 +112,6 @@
 #define PRIxFAST16  "x"
 #define PRIxFAST32  "lx"
 
-#define PRIxMAX     "lx"
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
@@ -131,7 +126,6 @@
 #define PRIXFAST16  "X"
 #define PRIXFAST32  "lX"
 
-#define PRIXMAX     "lX"
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
@@ -146,7 +140,6 @@
 #define SCNdFAST16  "d"
 #define SCNdFAST32  "ld"
 
-#define SCNdMAX     "ld"
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
@@ -161,7 +154,6 @@
 #define SCNiFAST16  "i"
 #define SCNiFAST32  "li"
 
-#define SCNiMAX     "li"
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
@@ -176,7 +168,6 @@
 #define SCNoFAST16  "o"
 #define SCNoFAST32  "lo"
 
-#define SCNoMAX     "lo"
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
@@ -191,7 +182,6 @@
 #define SCNuFAST16  "u"
 #define SCNuFAST32  "lu"
 
-#define SCNuMAX     "lu"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -206,7 +196,6 @@
 #define SCNxFAST16  "x"
 #define SCNxFAST32  "lx"
 
-#define SCNxMAX     "lx"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/arch/z80/include/z8/inttypes.h b/arch/z80/include/z8/inttypes.h
index 1fba81d..9738e1a 100644
--- a/arch/z80/include/z8/inttypes.h
+++ b/arch/z80/include/z8/inttypes.h
@@ -56,7 +56,6 @@
 #define PRIdFAST16  "d"
 #define PRIdFAST32  "ld"
 
-#define PRIdMAX     "ld"
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
@@ -71,7 +70,6 @@
 #define PRIiFAST16  "i"
 #define PRIiFAST32  "li"
 
-#define PRIiMAX     "li"
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
@@ -86,7 +84,6 @@
 #define PRIoFAST16  "o"
 #define PRIoFAST32  "lo"
 
-#define PRIoMAX     "lo"
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
@@ -101,7 +98,6 @@
 #define PRIuFAST16  "u"
 #define PRIuFAST32  "lu"
 
-#define PRIuMAX     "lu"
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
@@ -116,7 +112,6 @@
 #define PRIxFAST16  "x"
 #define PRIxFAST32  "lx"
 
-#define PRIxMAX     "lx"
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
@@ -131,7 +126,6 @@
 #define PRIXFAST16  "X"
 #define PRIXFAST32  "lX"
 
-#define PRIXMAX     "lX"
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
@@ -146,7 +140,6 @@
 #define SCNdFAST16  "d"
 #define SCNdFAST32  "ld"
 
-#define SCNdMAX     "ld"
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
@@ -161,7 +154,6 @@
 #define SCNiFAST16  "i"
 #define SCNiFAST32  "li"
 
-#define SCNiMAX     "li"
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
@@ -176,7 +168,6 @@
 #define SCNoFAST16  "o"
 #define SCNoFAST32  "lo"
 
-#define SCNoMAX     "lo"
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
@@ -191,7 +182,6 @@
 #define SCNuFAST16  "u"
 #define SCNuFAST32  "lu"
 
-#define SCNuMAX     "lu"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -206,7 +196,6 @@
 #define SCNxFAST16  "x"
 #define SCNxFAST32  "lx"
 
-#define SCNxMAX     "lx"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/arch/z80/include/z80/inttypes.h b/arch/z80/include/z80/inttypes.h
index dd73081..63c002c 100644
--- a/arch/z80/include/z80/inttypes.h
+++ b/arch/z80/include/z80/inttypes.h
@@ -56,7 +56,6 @@
 #define PRIdFAST16  "d"
 #define PRIdFAST32  "ld"
 
-#define PRIdMAX     "ld"
 #define PRIdPTR     "d"
 
 #define PRIi8       "i"
@@ -71,7 +70,6 @@
 #define PRIiFAST16  "i"
 #define PRIiFAST32  "li"
 
-#define PRIiMAX     "li"
 #define PRIiPTR     "i"
 
 #define PRIo8       "o"
@@ -86,7 +84,6 @@
 #define PRIoFAST16  "o"
 #define PRIoFAST32  "lo"
 
-#define PRIoMAX     "lo"
 #define PRIoPTR     "o"
 
 #define PRIu8       "u"
@@ -101,7 +98,6 @@
 #define PRIuFAST16  "u"
 #define PRIuFAST32  "lu"
 
-#define PRIuMAX     "lu"
 #define PRIuPTR     "u"
 
 #define PRIx8       "x"
@@ -116,7 +112,6 @@
 #define PRIxFAST16  "x"
 #define PRIxFAST32  "lx"
 
-#define PRIxMAX     "lx"
 #define PRIxPTR     "x"
 
 #define PRIX8       "X"
@@ -131,7 +126,6 @@
 #define PRIXFAST16  "X"
 #define PRIXFAST32  "lX"
 
-#define PRIXMAX     "lX"
 #define PRIXPTR     "X"
 
 #define SCNd8       "hhd"
@@ -146,7 +140,6 @@
 #define SCNdFAST16  "d"
 #define SCNdFAST32  "ld"
 
-#define SCNdMAX     "ld"
 #define SCNdPTR     "d"
 
 #define SCNi8       "hhi"
@@ -161,7 +154,6 @@
 #define SCNiFAST16  "i"
 #define SCNiFAST32  "li"
 
-#define SCNiMAX     "li"
 #define SCNiPTR     "i"
 
 #define SCNo8       "hho"
@@ -176,7 +168,6 @@
 #define SCNoFAST16  "o"
 #define SCNoFAST32  "lo"
 
-#define SCNoMAX     "lo"
 #define SCNoPTR     "o"
 
 #define SCNu8       "hhu"
@@ -191,7 +182,6 @@
 #define SCNuFAST16  "u"
 #define SCNuFAST32  "lu"
 
-#define SCNuMAX     "lu"
 #define SCNuPTR     "u"
 
 #define SCNx8       "hhx"
@@ -206,7 +196,6 @@
 #define SCNxFAST16  "x"
 #define SCNxFAST32  "lx"
 
-#define SCNxMAX     "lx"
 #define SCNxPTR     "x"
 
 #define INT8_C(x)   x
diff --git a/include/stdint.h b/include/stdint.h
index f3fe66e..69c54be 100644
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -147,6 +147,19 @@
 #  define UINTMAX_MIN       UINT64_MIN
 #  define UINTMAX_MAX       UINT64_MAX
 
+#  define PRIdMAX           PRId64
+#  define PRIiMAX           PRIi64
+#  define PRIoMAX           PRIo64
+#  define PRIuMAX           PRIu64
+#  define PRIxMAX           PRIx64
+#  define PRIXMAX           PRIX64
+
+#  define SCNdMAX           SCNd64
+#  define SCNiMAX           SCNi64
+#  define SCNoMAX           SCNo64
+#  define SCNuMAX           SCNu64
+#  define SCNxMAX           SCNx64
+
 #  define INTMAX_C(x)       INT64_C(x)
 #  define UINTMAX_C(x)      UINT64_C(x)
 #else
@@ -156,6 +169,19 @@
 #  define UINTMAX_MIN       UINT32_MIN
 #  define UINTMAX_MAX       UINT32_MAX
 
+#  define PRIdMAX           PRId32
+#  define PRIiMAX           PRIi32
+#  define PRIoMAX           PRIo32
+#  define PRIuMAX           PRIu32
+#  define PRIxMAX           PRIx32
+#  define PRIXMAX           PRIX32
+
+#  define SCNdMAX           SCNd32
+#  define SCNiMAX           SCNi32
+#  define SCNoMAX           SCNo32
+#  define SCNuMAX           SCNu32
+#  define SCNxMAX           SCNx32
+
 #  define INTMAX_C(x)       INT32_C(x)
 #  define UINTMAX_C(x)      UINT32_C(x)
 #endif