diff options
| author | Stefan Liebler <stli@linux.vnet.ibm.com> | 2014-03-24 16:49:13 +0100 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2014-03-24 16:59:01 +0100 |
| commit | 509361270b4b889e991400a70eb87d45304c01cd (patch) | |
| tree | 6935bce72ad382109282b8d57de4cdf1105f66dc | |
| parent | 26011b5cfa6a1a8d8005d65f11d97498444a4e95 (diff) | |
| download | glibc-509361270b4b889e991400a70eb87d45304c01cd.tar.gz glibc-509361270b4b889e991400a70eb87d45304c01cd.tar.xz glibc-509361270b4b889e991400a70eb87d45304c01cd.zip | |
S390: Fix namespace violation in struct stat (BZ #16714).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/s390/bits/stat.h | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index c0d13ab866..745d50ae86 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2014-03-24 Stefan Liebler <stli@linux.vnet.ibm.com> + [BZ #16714] + * sysdeps/unix/sysv/linux/s390/bits/stat.h + (struct stat): Rename member pad0 to __glibc_reserved0. + +2014-03-24 Stefan Liebler <stli@linux.vnet.ibm.com> + [BZ #16712] * sysdeps/s390/s390-32/bits/wordsize.h (__WORDSIZE32_SIZE_ULONG): New define. diff --git a/sysdeps/unix/sysv/linux/s390/bits/stat.h b/sysdeps/unix/sysv/linux/s390/bits/stat.h index c154fe9a4d..47db2d8547 100644 --- a/sysdeps/unix/sysv/linux/s390/bits/stat.h +++ b/sysdeps/unix/sysv/linux/s390/bits/stat.h @@ -55,7 +55,7 @@ struct stat __mode_t st_mode; /* File mode. */ __uid_t st_uid; /* User ID of the file's owner. */ __gid_t st_gid; /* Group ID of the file's group.*/ - int pad0; + int __glibc_reserved0; __dev_t st_rdev; /* Device number, if device. */ __off_t st_size; /* Size of file, in bytes. */ #ifdef __USE_XOPEN2K8 @@ -152,7 +152,7 @@ struct stat64 __mode_t st_mode; /* File mode. */ __uid_t st_uid; /* User ID of the file's owner. */ __gid_t st_gid; /* Group ID of the file's group.*/ - int pad0; + int __glibc_reserved0; __dev_t st_rdev; /* Device number, if device. */ __off_t st_size; /* Size of file, in bytes. */ # ifdef __USE_XOPEN2K8 |