Skip to content

Commit 2d0cf02

Browse files
committed
arch/xtensa: use compiler's definition of uint32 and int32
Modify types.h and inttypes.h to use the correct _int32_t and _uint32_t types. Type is now defined according to recent compiler versions. Signed-off-by: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
1 parent 2a38ce3 commit 2d0cf02

2 files changed

Lines changed: 15 additions & 15 deletions

File tree

arch/xtensa/include/inttypes.h

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,89 +33,89 @@
3333

3434
#define PRId8 "d"
3535
#define PRId16 "d"
36-
#define PRId32 "d"
36+
#define PRId32 "ld"
3737
#define PRId64 "lld"
3838

3939
#define PRIdPTR "d"
4040

4141
#define PRIi8 "i"
4242
#define PRIi16 "i"
43-
#define PRIi32 "i"
43+
#define PRIi32 "li"
4444
#define PRIi64 "lli"
4545

4646
#define PRIiPTR "i"
4747

4848
#define PRIo8 "o"
4949
#define PRIo16 "o"
50-
#define PRIo32 "o"
50+
#define PRIo32 "lo"
5151
#define PRIo64 "llo"
5252

5353
#define PRIoPTR "o"
5454

5555
#define PRIu8 "u"
5656
#define PRIu16 "u"
57-
#define PRIu32 "u"
57+
#define PRIu32 "lu"
5858
#define PRIu64 "llu"
5959

6060
#define PRIuPTR "u"
6161

6262
#define PRIx8 "x"
6363
#define PRIx16 "x"
64-
#define PRIx32 "x"
64+
#define PRIx32 "lx"
6565
#define PRIx64 "llx"
6666

6767
#define PRIxPTR "x"
6868

6969
#define PRIX8 "X"
7070
#define PRIX16 "X"
71-
#define PRIX32 "X"
71+
#define PRIX32 "lX"
7272
#define PRIX64 "llX"
7373

7474
#define PRIXPTR "X"
7575

7676
#define SCNd8 "hhd"
7777
#define SCNd16 "hd"
78-
#define SCNd32 "d"
78+
#define SCNd32 "ld"
7979
#define SCNd64 "lld"
8080

8181
#define SCNdPTR "d"
8282

8383
#define SCNi8 "hhi"
8484
#define SCNi16 "hi"
85-
#define SCNi32 "i"
85+
#define SCNi32 "li"
8686
#define SCNi64 "lli"
8787

8888
#define SCNiPTR "i"
8989

9090
#define SCNo8 "hho"
9191
#define SCNo16 "ho"
92-
#define SCNo32 "o"
92+
#define SCNo32 "lo"
9393
#define SCNo64 "llo"
9494

9595
#define SCNoPTR "o"
9696

9797
#define SCNu8 "hhu"
9898
#define SCNu16 "hu"
99-
#define SCNu32 "u"
99+
#define SCNu32 "lu"
100100
#define SCNu64 "llu"
101101

102102
#define SCNuPTR "u"
103103

104104
#define SCNx8 "hhx"
105105
#define SCNx16 "hx"
106-
#define SCNx32 "x"
106+
#define SCNx32 "lx"
107107
#define SCNx64 "llx"
108108

109109
#define SCNxPTR "x"
110110

111111
#define INT8_C(x) x
112112
#define INT16_C(x) x
113-
#define INT32_C(x) x
113+
#define INT32_C(x) x ## ll
114114
#define INT64_C(x) x ## ll
115115

116116
#define UINT8_C(x) x
117117
#define UINT16_C(x) x
118-
#define UINT32_C(x) x ## u
118+
#define UINT32_C(x) x ## ul
119119
#define UINT64_C(x) x ## ull
120120

121121
#endif /* __ARCH_XTENSA_INCLUDE_INTTYPES_H */

arch/xtensa/include/types.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ typedef unsigned char _uint8_t;
5656
typedef signed short _int16_t;
5757
typedef unsigned short _uint16_t;
5858

59-
typedef signed int _int32_t;
60-
typedef unsigned int _uint32_t;
59+
typedef long int _int32_t;
60+
typedef long unsigned int _uint32_t;
6161

6262
typedef signed long long _int64_t;
6363
typedef unsigned long long _uint64_t;

0 commit comments

Comments
 (0)