S/390: Fix namespace violation
diff mbox

Message ID lg9f9c$e01$2@ger.gmane.org
State New
Headers show

Commit Message

Stefan Liebler March 18, 2014, 12:47 p.m. UTC
On 03/14/2014 10:44 PM, Carlos O'Donell wrote:
> On 03/14/2014 01:02 PM, Roland McGrath wrote:
>> If you're going to touch it at all , you should make it follow the new
>> convention and be __glibc_reserved* instead.
>
> Agreed.
>
> See:
> https://sourceware.org/glibc/wiki/Consensus
> ~~~
> Anyone can commit a change to any header to rename __block to
> __glibc_block or __unused to __glibc_reserved. Multiple versions
> of the same symbol can be created by appending a number e.g.
> __glibc_reserved1. Consenus was reached that glibc would use
> the internal prefix __glibc to avoid name collisions with
> other tools that comprise the implementation from a standard
> perspective.
> See https://sourceware.org/ml/libc-alpha/2012-02/msg00047.html.
> Note that __unused is used by source from BSD that defines it as
> the unused attribute for the compiler, while __block is used by
> Clang's -fblocks extension.
> ~~~
>
> Cheers,
> Carlos.
>
>

Okay. Member pad0 is now renamed to __glibc_reserved0.
Tested on s390/s390x.
Bye

---
2014-03-18  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.
---

Patch
diff mbox

diff --git a/sysdeps/unix/sysv/linux/s390/bits/stat.h b/sysdeps/unix/sysv/linux/s390/bits/stat.h
index c154fe9..47db2d8 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