From: Eric Pouech <epouech@codeweavers.com> When stdint.h and intsafe.h are both #include:d, we should ensure that #define:s on both files are exactly the same in order not to have preprocessor errors. Signed-off-by: Eric Pouech <epouech@codeweavers.com> --- include/msvcrt/stdint.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/include/msvcrt/stdint.h b/include/msvcrt/stdint.h index 6efea0b73cf..8484c20acd4 100644 --- a/include/msvcrt/stdint.h +++ b/include/msvcrt/stdint.h @@ -70,19 +70,19 @@ typedef unsigned long long uintmax_t; defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L /* 7.18.2.1 Limits of exact-width integer types */ -#define INT8_MIN (-128) -#define INT16_MIN (-32768) -#define INT32_MIN (-2147483647 - 1) -#define INT64_MIN (-9223372036854775807LL - 1) - -#define INT8_MAX 127 -#define INT16_MAX 32767 -#define INT32_MAX 2147483647 -#define INT64_MAX 9223372036854775807LL - -#define UINT8_MAX 255 -#define UINT16_MAX 65535 -#define UINT32_MAX 0xffffffffU /* 4294967295U */ +#define INT8_MIN (-0x80) +#define INT16_MIN (-0x8000) +#define INT32_MIN (-0x7fffffff - 1) +#define INT64_MIN (-0x7fffffffffffffffLL - 1) + +#define INT8_MAX 0x7f +#define INT16_MAX 0x7fff +#define INT32_MAX 0x7fffffff +#define INT64_MAX 0x7fffffffffffffffLL + +#define UINT8_MAX 0xff +#define UINT16_MAX 0xffff +#define UINT32_MAX 0xffffffffu /* 4294967295U */ #define UINT64_MAX 0xffffffffffffffffULL /* 18446744073709551615ULL */ /* 7.18.2.2 Limits of minimum-width integer types */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10130