From 8dc102b20b2771ef9b596d79fab3f9f64418f199 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 7 Apr 2009 17:23:20 +0000 Subject: [PATCH] * include/stdint.h (int_least32_t): Define as int. (uint_least32_t): Ditto, unsigned. (int_fast16_t): Define as int. (int_fast32_t): Ditto. (uint_fast16_t): Ditto, unsigned. (uint_fast32_t): Ditto. (UINT32_MAX): Remove `L' long marker. (UINT_LEAST32_MAX): Ditto. (UINT_FAST16_MAX): Ditto. (UINT_FAST32_MAX): Ditto. (INT32_C): Ditto. (UINT32_C): Ditto. --- winsup/cygwin/ChangeLog | 15 +++++++++++++++ winsup/cygwin/include/stdint.h | 24 ++++++++++++------------ 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 9f9670680..594efbd78 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,18 @@ +2009-04-07 Corinna Vinschen + + * include/stdint.h (int_least32_t): Define as int. + (uint_least32_t): Ditto, unsigned. + (int_fast16_t): Define as int. + (int_fast32_t): Ditto. + (uint_fast16_t): Ditto, unsigned. + (uint_fast32_t): Ditto. + (UINT32_MAX): Remove `L' long marker. + (UINT_LEAST32_MAX): Ditto. + (UINT_FAST16_MAX): Ditto. + (UINT_FAST32_MAX): Ditto. + (INT32_C): Ditto. + (UINT32_C): Ditto. + 2009-04-07 Corinna Vinschen * strfuncs.cc: Change WCHAR to wchar_t in multibyte<->widechar diff --git a/winsup/cygwin/include/stdint.h b/winsup/cygwin/include/stdint.h index 9d45015f0..7ea000f8f 100644 --- a/winsup/cygwin/include/stdint.h +++ b/winsup/cygwin/include/stdint.h @@ -33,24 +33,24 @@ typedef unsigned long long uint64_t; typedef signed char int_least8_t; typedef short int_least16_t; -typedef long int_least32_t; +typedef int int_least32_t; typedef long long int_least64_t; typedef unsigned char uint_least8_t; typedef unsigned short uint_least16_t; -typedef unsigned long uint_least32_t; +typedef unsigned int uint_least32_t; typedef unsigned long long uint_least64_t; /* Fastest minimum-width integer types */ typedef signed char int_fast8_t; -typedef long int_fast16_t; -typedef long int_fast32_t; +typedef int int_fast16_t; +typedef int int_fast32_t; typedef long long int_fast64_t; typedef unsigned char uint_fast8_t; -typedef unsigned long uint_fast16_t; -typedef unsigned long uint_fast32_t; +typedef unsigned int uint_fast16_t; +typedef unsigned int uint_fast32_t; typedef unsigned long long uint_fast64_t; /* Integer types capable of holding object pointers */ @@ -80,7 +80,7 @@ typedef unsigned long long uintmax_t; #define UINT8_MAX (255) #define UINT16_MAX (65535) -#define UINT32_MAX (4294967295UL) +#define UINT32_MAX (4294967295U) #define UINT64_MAX (18446744073709551615ULL) /* Limits of minimum-width integer types */ @@ -97,7 +97,7 @@ typedef unsigned long long uintmax_t; #define UINT_LEAST8_MAX (255) #define UINT_LEAST16_MAX (65535) -#define UINT_LEAST32_MAX (4294967295UL) +#define UINT_LEAST32_MAX (4294967295U) #define UINT_LEAST64_MAX (18446744073709551615ULL) /* Limits of fastest minimum-width integer types */ @@ -113,8 +113,8 @@ typedef unsigned long long uintmax_t; #define INT_FAST64_MAX (9223372036854775807LL) #define UINT_FAST8_MAX (255) -#define UINT_FAST16_MAX (4294967295UL) -#define UINT_FAST32_MAX (4294967295UL) +#define UINT_FAST16_MAX (4294967295U) +#define UINT_FAST32_MAX (4294967295U) #define UINT_FAST64_MAX (18446744073709551615ULL) /* Limits of integer types capable of holding object pointers */ @@ -166,12 +166,12 @@ typedef unsigned long long uintmax_t; #define INT8_C(x) x #define INT16_C(x) x -#define INT32_C(x) x ## L +#define INT32_C(x) x #define INT64_C(x) x ## LL #define UINT8_C(x) x #define UINT16_C(x) x -#define UINT32_C(x) x ## UL +#define UINT32_C(x) x ## U #define UINT64_C(x) x ## ULL /* Macros for greatest-width integer constant expressions */