From 26011b5cfa6a1a8d8005d65f11d97498444a4e95 Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Mon, 24 Mar 2014 16:46:51 +0100 Subject: S390: Define SIZE_MAX as unsigned long (BZ #16712). --- ChangeLog | 10 ++++++++++ sysdeps/generic/stdint.h | 6 +++++- sysdeps/s390/s390-32/bits/wordsize.h | 1 + sysdeps/s390/s390-64/bits/wordsize.h | 1 + 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4da10277cc..c0d13ab866 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2014-03-24 Stefan Liebler + + [BZ #16712] + * sysdeps/s390/s390-32/bits/wordsize.h + (__WORDSIZE32_SIZE_ULONG): New define. + * sysdeps/s390/s390-64/bits/wordsize.h + (__WORDSIZE32_SIZE_ULONG): Likewise. + * sysdeps/generic/stdint.h (SIZE_MAX): + Define as UL if __WORDSIZE32_SIZE_ULONG. + 2014-03-24 Stefan Liebler [BZ #16713] diff --git a/sysdeps/generic/stdint.h b/sysdeps/generic/stdint.h index 4660748af1..f5d955648b 100644 --- a/sysdeps/generic/stdint.h +++ b/sysdeps/generic/stdint.h @@ -260,7 +260,11 @@ typedef unsigned long long int uintmax_t; # if __WORDSIZE == 64 # define SIZE_MAX (18446744073709551615UL) # else -# define SIZE_MAX (4294967295U) +# ifdef __WORDSIZE32_SIZE_ULONG +# define SIZE_MAX (4294967295UL) +# else +# define SIZE_MAX (4294967295U) +# endif # endif /* Limits of `wchar_t'. */ diff --git a/sysdeps/s390/s390-32/bits/wordsize.h b/sysdeps/s390/s390-32/bits/wordsize.h index b41661217f..da791fa28e 100644 --- a/sysdeps/s390/s390-32/bits/wordsize.h +++ b/sysdeps/s390/s390-32/bits/wordsize.h @@ -4,6 +4,7 @@ # define __WORDSIZE 64 #else # define __WORDSIZE 32 +# define __WORDSIZE32_SIZE_ULONG 1 #endif #if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL diff --git a/sysdeps/s390/s390-64/bits/wordsize.h b/sysdeps/s390/s390-64/bits/wordsize.h index b41661217f..da791fa28e 100644 --- a/sysdeps/s390/s390-64/bits/wordsize.h +++ b/sysdeps/s390/s390-64/bits/wordsize.h @@ -4,6 +4,7 @@ # define __WORDSIZE 64 #else # define __WORDSIZE 32 +# define __WORDSIZE32_SIZE_ULONG 1 #endif #if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL -- cgit 1.4.1