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/nds32/bits/kernel_stat.h | 4 ++-- libc/sysdeps/linux/nds32/bits/shm.h | 18 +++++++++--------- libc/sysdeps/linux/nds32/bits/stat.h | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'libc/sysdeps/linux/nds32') diff --git a/libc/sysdeps/linux/nds32/bits/kernel_stat.h b/libc/sysdeps/linux/nds32/bits/kernel_stat.h index 9e5c40d15..3c0911c01 100644 --- a/libc/sysdeps/linux/nds32/bits/kernel_stat.h +++ b/libc/sysdeps/linux/nds32/bits/kernel_stat.h @@ -30,8 +30,8 @@ struct kernel_stat { struct timespec st_atim; struct timespec st_mtim; struct timespec st_ctim; - unsigned long __unused4; - unsigned long __unused5; + unsigned long __uclibc_unused4; + unsigned long __uclibc_unused5; }; struct kernel_stat64 { diff --git a/libc/sysdeps/linux/nds32/bits/shm.h b/libc/sysdeps/linux/nds32/bits/shm.h index 51e1ece7f..8904b6252 100644 --- a/libc/sysdeps/linux/nds32/bits/shm.h +++ b/libc/sysdeps/linux/nds32/bits/shm.h @@ -55,16 +55,16 @@ struct shmid_ds struct ipc_perm shm_perm; /* operation permission struct */ size_t shm_segsz; /* size of segment in bytes */ __time_t shm_atime; /* time of last shmat() */ - unsigned long int __unused1; + unsigned long int __uclibc_unused1; __time_t shm_dtime; /* time of last shmdt() */ - unsigned long int __unused2; + unsigned long int __uclibc_unused2; __time_t shm_ctime; /* time of last change by shmctl() */ - unsigned long int __unused3; + unsigned long int __uclibc_unused3; __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 __unused4; - unsigned long int __unused5; + unsigned long int __uclibc_unused4; + unsigned long int __uclibc_unused5; }; #ifdef __USE_MISC @@ -85,10 +85,10 @@ struct shminfo unsigned long int shmmni; unsigned long int shmseg; unsigned long int shmall; - unsigned long int __unused1; - unsigned long int __unused2; - unsigned long int __unused3; - unsigned long int __unused4; + unsigned long int __uclibc_unused1; + unsigned long int __uclibc_unused2; + unsigned long int __uclibc_unused3; + unsigned long int __uclibc_unused4; }; struct shm_info diff --git a/libc/sysdeps/linux/nds32/bits/stat.h b/libc/sysdeps/linux/nds32/bits/stat.h index fe25292cb..c4e09e0f2 100644 --- a/libc/sysdeps/linux/nds32/bits/stat.h +++ b/libc/sysdeps/linux/nds32/bits/stat.h @@ -86,8 +86,8 @@ struct stat unsigned long int st_ctimensec; /* Nsecs of last status change. */ #endif #ifndef __USE_FILE_OFFSET64 - unsigned long int __unused4; - unsigned long int __unused5; + unsigned long int __uclibc_unused4; + unsigned long int __uclibc_unused5; #else __ino64_t st_ino; /* File serial number. */ #endif -- cgit v1.2.3