Skip to content

Commit e3c859e

Browse files
committed
[PSDK] intsafe.h: Define MIN/MAX macros the same way as in stdint.h
This avoids redefinition warnings.
1 parent d52031a commit e3c859e

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

sdk/include/psdk/intsafe.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ C_ASSERT(sizeof(DWORD) == 4);
117117
C_ASSERT(sizeof(UINT_PTR) == sizeof(ULONG_PTR));
118118

119119
/* Integer range margins (use (x-1) to prevent warnings) */
120-
#define INT8_MIN ((signed char)(-127 - 1))
120+
#define INT8_MIN (-128)
121121
#define SHORT_MIN (-32768)
122-
#define INT16_MIN ((short)(-32767 - 1))
122+
#define INT16_MIN (-32768)
123123
#define INT_MIN (-2147483647 - 1)
124124
#define INT32_MIN (-2147483647 - 1)
125125
#define LONG_MIN (-2147483647L - 1)
@@ -139,18 +139,18 @@ C_ASSERT(sizeof(UINT_PTR) == sizeof(ULONG_PTR));
139139
#define SSIZE_T_MIN (-2147483647L - 1)
140140
#endif /* _WIN64 */
141141

142-
#define INT8_MAX ((signed char)127)
143-
#define UINT8_MAX ((unsigned char)0xffU)
144-
#define BYTE_MAX ((unsigned char)0xff)
145-
#define SHORT_MAX ((short)32767)
146-
#define INT16_MAX ((short)32767)
147-
#define USHORT_MAX ((unsigned short)0xffff)
148-
#define UINT16_MAX ((unsigned short)0xffff)
149-
#define WORD_MAX ((unsigned short)0xffff)
142+
#define INT8_MAX 127
143+
#define UINT8_MAX 0xff /* 255U */
144+
#define BYTE_MAX 0xff /* 255U */
145+
#define SHORT_MAX 32767
146+
#define INT16_MAX 32767
147+
#define USHORT_MAX 0xffff /* 65535U */
148+
#define UINT16_MAX 0xffff /* 65535U */
149+
#define WORD_MAX 0xffff /* 65535U */
150150
#define INT_MAX 2147483647
151151
#define INT32_MAX 2147483647
152152
#define UINT_MAX 0xffffffff
153-
#define UINT32_MAX 0xffffffffU
153+
#define UINT32_MAX 0xffffffff /* 4294967295U */
154154
#define LONG_MAX 2147483647L
155155
#define ULONG_MAX 0xffffffffUL
156156
#define DWORD_MAX 0xffffffffUL
@@ -161,7 +161,7 @@ C_ASSERT(sizeof(UINT_PTR) == sizeof(ULONG_PTR));
161161
#define DWORDLONG_MAX 0xffffffffffffffffULL
162162
#define ULONG64_MAX 0xffffffffffffffffULL
163163
#define DWORD64_MAX 0xffffffffffffffffULL
164-
#define UINT64_MAX 0xffffffffffffffffULL
164+
#define UINT64_MAX 0xffffffffffffffffULL /* 18446744073709551615ULL */
165165
#define INT128_MAX 170141183460469231731687303715884105727i128
166166
#define UINT128_MAX 0xffffffffffffffffffffffffffffffffui128
167167
#undef SIZE_T_MAX

0 commit comments

Comments
 (0)