Browse Source

Fix inttypes a little

jD91mZM2 6 years ago
parent
commit
ce53ac7e13
1 changed files with 119 additions and 119 deletions
  1. 119 119
      include/bits/inttypes.h

+ 119 - 119
include/bits/inttypes.h

@@ -4,92 +4,92 @@
 #define PRId8  "hhd"
 #define PRId16 "hd"
 #define PRId32 "d"
-#define PRId64 "Ld"
+#define PRId64 "ld"
 
 #define PRIdLEAST8  "hhd"
 #define PRIdLEAST16 "hd"
 #define PRIdLEAST32 "d"
-#define PRIdLEAST64 "Ld"
+#define PRIdLEAST64 "ld"
 
 #define PRIdFAST8  "hhd"
 #define PRIdFAST16 "hd"
 #define PRIdFAST32 "d"
-#define PRIdFAST64 "Ld"
+#define PRIdFAST64 "ld"
 
 #define PRIi8  "hhi"
 #define PRIi16 "hi"
-#define PRIi32 "li"
-#define PRIi64 "Li"
+#define PRIi32 "i"
+#define PRIi64 "li"
 
 #define PRIiLEAST8  "hhi"
 #define PRIiLEAST16 "hi"
-#define PRIiLEAST32 "li"
-#define PRIiLEAST64 "Li"
+#define PRIiLEAST32 "i"
+#define PRIiLEAST64 "li"
 
 #define PRIiFAST8  "hhi"
 #define PRIiFAST16 "hi"
-#define PRIiFAST32 "li"
-#define PRIiFAST64 "Li"
+#define PRIiFAST32 "i"
+#define PRIiFAST64 "li"
 
 #define PRIo8  "hho"
 #define PRIo16 "ho"
-#define PRIo32 "lo"
-#define PRIo64 "Lo"
+#define PRIo32 "o"
+#define PRIo64 "lo"
 
 #define PRIoLEAST8  "hho"
 #define PRIoLEAST16 "ho"
-#define PRIoLEAST32 "lo"
-#define PRIoLEAST64 "Lo"
+#define PRIoLEAST32 "o"
+#define PRIoLEAST64 "lo"
 
 #define PRIoFAST8  "hho"
 #define PRIoFAST16 "ho"
-#define PRIoFAST32 "lo"
-#define PRIoFAST64 "Lo"
+#define PRIoFAST32 "o"
+#define PRIoFAST64 "lo"
 
 #define PRIu8  "hhu"
 #define PRIu16 "hu"
-#define PRIu32 "lu"
-#define PRIu64 "Lu"
+#define PRIu32 "u"
+#define PRIu64 "lu"
 
 #define PRIuLEAST8  "hhu"
 #define PRIuLEAST16 "hu"
-#define PRIuLEAST32 "lu"
-#define PRIuLEAST64 "Lu"
+#define PRIuLEAST32 "u"
+#define PRIuLEAST64 "lu"
 
 #define PRIuFAST8  "hhu"
 #define PRIuFAST16 "hu"
-#define PRIuFAST32 "lu"
-#define PRIuFAST64 "Lu"
+#define PRIuFAST32 "u"
+#define PRIuFAST64 "lu"
 
 #define PRIx8  "hhx"
 #define PRIx16 "hx"
-#define PRIx32 "lx"
-#define PRIx64 "Lx"
+#define PRIx32 "x"
+#define PRIx64 "lx"
 
 #define PRIxLEAST8  "hhx"
 #define PRIxLEAST16 "hx"
-#define PRIxLEAST32 "lx"
-#define PRIxLEAST64 "Lx"
+#define PRIxLEAST32 "x"
+#define PRIxLEAST64 "lx"
 
 #define PRIxFAST8  "hhx"
 #define PRIxFAST16 "hx"
-#define PRIxFAST32 "lx"
-#define PRIxFAST64 "Lx"
+#define PRIxFAST32 "x"
+#define PRIxFAST64 "lx"
 
 #define PRIX8  "hhX"
 #define PRIX16 "hX"
-#define PRIX32 "lX"
-#define PRIX64 "LX"
+#define PRIX32 "X"
+#define PRIX64 "lX"
 
 #define PRIXLEAST8  "hhX"
 #define PRIXLEAST16 "hX"
-#define PRIXLEAST32 "lX"
-#define PRIXLEAST64 "LX"
+#define PRIXLEAST32 "X"
+#define PRIXLEAST64 "lX"
 
 #define PRIXFAST8  "hhX"
 #define PRIXFAST16 "hX"
-#define PRIXFAST32 "lX"
-#define PRIXFAST64 "LX"
+#define PRIXFAST32 "X"
+#define PRIXFAST64 "lX"
 
 #define PRIdMAX "jd"
 #define PRIiMAX "ji"
@@ -105,91 +105,91 @@
 #define PRIxPTR "tx"
 #define PRIXPTR "tX"
 
-#define SCNd8  "hhd"
-#define SCNd16 "hd"
-#define SCNd32 "d"
-#define SCNd64 "Ld"
-
-#define SCNdLEAST8  "hhd"
-#define SCNdLEAST16 "hd"
-#define SCNdLEAST32 "d"
-#define SCNdLEAST64 "Ld"
-
-#define SCNdFAST8  "hhd"
-#define SCNdFAST16 "hd"
-#define SCNdFAST32 "d"
-#define SCNdFAST64 "Ld"
-
-#define SCNi8  "hhi"
-#define SCNi16 "hi"
-#define SCNi32 "li"
-#define SCNi64 "Li"
-
-#define SCNiLEAST8  "hhi"
-#define SCNiLEAST16 "hi"
-#define SCNiLEAST32 "li"
-#define SCNiLEAST64 "Li"
-
-#define SCNiFAST8  "hhi"
-#define SCNiFAST16 "hi"
-#define SCNiFAST32 "li"
-#define SCNiFAST64 "Li"
-
-#define SCNo8  "hho"
-#define SCNo16 "ho"
-#define SCNo32 "lo"
-#define SCNo64 "Lo"
-
-#define SCNoLEAST8  "hho"
-#define SCNoLEAST16 "ho"
-#define SCNoLEAST32 "lo"
-#define SCNoLEAST64 "Lo"
-
-#define SCNoFAST8  "hho"
-#define SCNoFAST16 "ho"
-#define SCNoFAST32 "lo"
-#define SCNoFAST64 "Lo"
-
-#define SCNu8  "hhu"
-#define SCNu16 "hu"
-#define SCNu32 "lu"
-#define SCNu64 "Lu"
-
-#define SCNuLEAST8  "hhu"
-#define SCNuLEAST16 "hu"
-#define SCNuLEAST32 "lu"
-#define SCNuLEAST64 "Lu"
-
-#define SCNuFAST8  "hhu"
-#define SCNuFAST16 "hu"
-#define SCNuFAST32 "lu"
-#define SCNuFAST64 "Lu"
-
-#define SCNx8  "hhx"
-#define SCNx16 "hx"
-#define SCNx32 "lx"
-#define SCNx64 "Lx"
-
-#define SCNxLEAST8  "hhx"
-#define SCNxLEAST16 "hx"
-#define SCNxLEAST32 "lx"
-#define SCNxLEAST64 "Lx"
-
-#define SCNxFAST8  "hhx"
-#define SCNxFAST16 "hx"
-#define SCNxFAST32 "lx"
-#define SCNxFAST64 "Lx"
-
-#define SCNdMAX "jd"
-#define SCNiMAX "ji"
-#define SCNoMAX "jo"
-#define SCNuMAX "ju"
-#define SCNxMAX "jx"
-
-#define SCNdPTR "td"
-#define SCNiPTR "ti"
-#define SCNoPTR "to"
-#define SCNuPTR "tu"
-#define SCNxPTR "tx"
+#define SCNd8  PRId8
+#define SCNd16 PRId16
+#define SCNd32 PRId32
+#define SCNd64 PRId64
+
+#define SCNdLEAST8  PRIdLEAST8
+#define SCNdLEAST16 PRIdLEAST16
+#define SCNdLEAST32 PRIdLEAST32
+#define SCNdLEAST64 PRIdLEAST64
+
+#define SCNdFAST8  PRIdFAST8
+#define SCNdFAST16 PRIdFAST16
+#define SCNdFAST32 PRIdFAST32
+#define SCNdFAST64 PRIdFAST64
+
+#define SCNi8  PRIi8
+#define SCNi16 PRIi16
+#define SCNi32 PRIi32
+#define SCNi64 PRIi64
+
+#define SCNiLEAST8  PRIiLEAST8
+#define SCNiLEAST16 PRIiLEAST16
+#define SCNiLEAST32 PRIiLEAST32
+#define SCNiLEAST64 PRIiLEAST64
+
+#define SCNiFAST8  PRIiFAST8
+#define SCNiFAST16 PRIiFAST16
+#define SCNiFAST32 PRIiFAST32
+#define SCNiFAST64 PRIiFAST64
+
+#define SCNo8  PRIo8
+#define SCNo16 PRIo16
+#define SCNo32 PRIo32
+#define SCNo64 PRIo64
+
+#define SCNoLEAST8  PRIoLEAST8
+#define SCNoLEAST16 PRIoLEAST16
+#define SCNoLEAST32 PRIoLEAST32
+#define SCNoLEAST64 PRIoLEAST64
+
+#define SCNoFAST8  PRIoFAST8
+#define SCNoFAST16 PRIoFAST16
+#define SCNoFAST32 PRIoFAST32
+#define SCNoFAST64 PRIoFAST64
+
+#define SCNu8  PRIu8
+#define SCNu16 PRIu16
+#define SCNu32 PRIu32
+#define SCNu64 PRIu64
+
+#define SCNuLEAST8  PRIuLEAST8
+#define SCNuLEAST16 PRIuLEAST16
+#define SCNuLEAST32 PRIuLEAST32
+#define SCNuLEAST64 PRIuLEAST64
+
+#define SCNuFAST8  PRIuFAST8
+#define SCNuFAST16 PRIuFAST16
+#define SCNuFAST32 PRIuFAST32
+#define SCNuFAST64 PRIuFAST64
+
+#define SCNx8  PRIx8
+#define SCNx16 PRIx16
+#define SCNx32 PRIx32
+#define SCNx64 PRIx64
+
+#define SCNxLEAST8  PRIxLEAST8
+#define SCNxLEAST16 PRIxLEAST16
+#define SCNxLEAST32 PRIxLEAST32
+#define SCNxLEAST64 PRIxLEAST64
+
+#define SCNxFAST8  PRIxFAST8
+#define SCNxFAST16 PRIxFAST16
+#define SCNxFAST32 PRIxFAST32
+#define SCNxFAST64 PRIxFAST64
+
+#define SCNdMAX PRIdMAX
+#define SCNiMAX PRIiMAX
+#define SCNoMAX PRIoMAX
+#define SCNuMAX PRIuMAX
+#define SCNxMAX PRIxMAX
+
+#define SCNdPTR PRIdPTR
+#define SCNiPTR PRIiPTR
+#define SCNoPTR PRIoPTR
+#define SCNuPTR PRIuPTR
+#define SCNxPTR PRIxPTR
 
 #endif