S390: Fix namespace violation in struct stat (BZ #16714).

diff --git a/ChangeLog b/ChangeLog
index c0d13ab..745d50a 100644 (file)
--- 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 c154fe9..47db2d8 100644 (file)
--- 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