From 93277314f0ec84409e15f6e2cd616d028cb53065 Mon Sep 17 00:00:00 2001 From: Ed Wildgoose Date: Tue, 16 Jun 2020 15:00:56 +0100 Subject: Rename __unused struct members to include a namespace Rename various spare fields in structs to include a namespace This should avoid accidental clashes with uses of the __unused symbol in upstream projects. eg currently it causes a compile error in dhcpcd 8.x due to their re-use of the __unused symbol as a macro This follows the style of glibc which does something equivalent --- libc/sysdeps/linux/sparc64/bits/shm.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libc/sysdeps/linux/sparc64/bits/shm.h') diff --git a/libc/sysdeps/linux/sparc64/bits/shm.h b/libc/sysdeps/linux/sparc64/bits/shm.h index a5d8c3464..b76c4c32b 100644 --- a/libc/sysdeps/linux/sparc64/bits/shm.h +++ b/libc/sysdeps/linux/sparc64/bits/shm.h @@ -55,8 +55,8 @@ struct shmid_ds __pid_t shm_cpid; /* pid of creator */ __pid_t shm_lpid; /* pid of last shmop */ shmatt_t shm_nattch; /* number of current attaches */ - unsigned long int __unused1; - unsigned long int __unused2; + unsigned long int __uclibc_unused1; + unsigned long int __uclibc_unused2; }; #ifdef __USE_MISC @@ -78,10 +78,10 @@ struct shminfo unsigned long shmmni; unsigned long shmseg; unsigned long shmall; - unsigned long __unused1; - unsigned long __unused2; - unsigned long __unused3; - unsigned long __unused4; + unsigned long __uclibc_unused1; + unsigned long __uclibc_unused2; + unsigned long __uclibc_unused3; + unsigned long __uclibc_unused4; }; struct shm_info -- cgit v1.2.3