diff options
| author | Stefan Liebler <stli@linux.vnet.ibm.com> | 2014-03-24 16:46:51 +0100 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2014-03-24 16:59:01 +0100 |
| commit | 26011b5cfa6a1a8d8005d65f11d97498444a4e95 (patch) | |
| tree | 994abeccb68e48b568d38fb8a126182e33fff369 | |
| parent | a2d86bf1ec3208e838156be8b90e3790946948f4 (diff) | |
| download | glibc-26011b5cfa6a1a8d8005d65f11d97498444a4e95.tar.gz glibc-26011b5cfa6a1a8d8005d65f11d97498444a4e95.tar.xz glibc-26011b5cfa6a1a8d8005d65f11d97498444a4e95.zip | |
S390: Define SIZE_MAX as unsigned long (BZ #16712).
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | sysdeps/generic/stdint.h | 6 | ||||
| -rw-r--r-- | sysdeps/s390/s390-32/bits/wordsize.h | 1 | ||||
| -rw-r--r-- | sysdeps/s390/s390-64/bits/wordsize.h | 1 |
4 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 4da10277cc..c0d13ab866 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2014-03-24 Stefan Liebler <stli@linux.vnet.ibm.com> + [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 <stli@linux.vnet.ibm.com> + [BZ #16713] * sysdeps/unix/sysv/linux/s390/bits/sigaction.h (__glibc_reserved0): New variable. 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 |