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/sparc/bits/fcntl.h | 4 ++-- libc/sysdeps/linux/sparc/bits/ipc.h | 4 ++-- libc/sysdeps/linux/sparc/bits/msq.h | 4 ++-- libc/sysdeps/linux/sparc/bits/sem.h | 4 ++-- libc/sysdeps/linux/sparc/bits/shm.h | 12 ++++++------ libc/sysdeps/linux/sparc/bits/stat.h | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) (limited to 'libc/sysdeps/linux/sparc') diff --git a/libc/sysdeps/linux/sparc/bits/fcntl.h b/libc/sysdeps/linux/sparc/bits/fcntl.h index 9ccc5946d..b93e3d354 100644 --- a/libc/sysdeps/linux/sparc/bits/fcntl.h +++ b/libc/sysdeps/linux/sparc/bits/fcntl.h @@ -163,7 +163,7 @@ struct flock __off64_t l_len; /* Size of the locked area; zero means until EOF. */ #endif __pid_t l_pid; /* Process holding the lock. */ - short int __unused; + short int __uclibc_unused; }; #ifdef __USE_LARGEFILE64 @@ -174,7 +174,7 @@ struct flock64 __off64_t l_start; /* Offset where the lock begins. */ __off64_t l_len; /* Size of the locked area; zero means until EOF. */ __pid_t l_pid; /* Process holding the lock. */ - short int __unused; + short int __uclibc_unused; }; #endif diff --git a/libc/sysdeps/linux/sparc/bits/ipc.h b/libc/sysdeps/linux/sparc/bits/ipc.h index 017d0e1bc..193097ff8 100644 --- a/libc/sysdeps/linux/sparc/bits/ipc.h +++ b/libc/sysdeps/linux/sparc/bits/ipc.h @@ -49,6 +49,6 @@ struct ipc_perm unsigned short int mode; /* Read/write permission. */ unsigned short int __pad2; unsigned short int __seq; /* Sequence number. */ - unsigned long long int __unused1; - unsigned long long int __unused2; + unsigned long long int __uclibc_unused1; + unsigned long long int __uclibc_unused2; }; diff --git a/libc/sysdeps/linux/sparc/bits/msq.h b/libc/sysdeps/linux/sparc/bits/msq.h index b8bcf31bf..2558a7bcb 100644 --- a/libc/sysdeps/linux/sparc/bits/msq.h +++ b/libc/sysdeps/linux/sparc/bits/msq.h @@ -47,8 +47,8 @@ struct msqid_ds msglen_t msg_qbytes; /* max number of bytes allowed on queue */ __pid_t msg_lspid; /* pid of last msgsnd() */ __pid_t msg_lrpid; /* pid of last msgrcv() */ - unsigned long int __unused1; - unsigned long int __unused2; + unsigned long int __uclibc_unused1; + unsigned long int __uclibc_unused2; }; #ifdef __USE_MISC diff --git a/libc/sysdeps/linux/sparc/bits/sem.h b/libc/sysdeps/linux/sparc/bits/sem.h index 3faaadd96..04c579fc6 100644 --- a/libc/sysdeps/linux/sparc/bits/sem.h +++ b/libc/sysdeps/linux/sparc/bits/sem.h @@ -42,8 +42,8 @@ struct semid_ds unsigned int __pad2; __time_t sem_ctime; /* last time changed by semctl() */ unsigned long int sem_nsems; /* number of semaphores in set */ - unsigned long int __unused1; - unsigned long int __unused2; + unsigned long int __uclibc_unused1; + unsigned long int __uclibc_unused2; }; /* The user should define a union like the following to use it for arguments diff --git a/libc/sysdeps/linux/sparc/bits/shm.h b/libc/sysdeps/linux/sparc/bits/shm.h index 7ef10fc76..3f519ce8e 100644 --- a/libc/sysdeps/linux/sparc/bits/shm.h +++ b/libc/sysdeps/linux/sparc/bits/shm.h @@ -58,8 +58,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 @@ -81,10 +81,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 diff --git a/libc/sysdeps/linux/sparc/bits/stat.h b/libc/sysdeps/linux/sparc/bits/stat.h index 7ec7d9b23..b88885fe2 100644 --- a/libc/sysdeps/linux/sparc/bits/stat.h +++ b/libc/sysdeps/linux/sparc/bits/stat.h @@ -74,8 +74,8 @@ struct stat __time_t st_ctime; /* Time of last status change. */ unsigned long int st_ctimensec; /* Nsecs of last status change. */ #endif - unsigned long int __unused4; - unsigned long int __unused5; + unsigned long int __uclibc_unused4; + unsigned long int __uclibc_unused5; }; #ifdef __USE_LARGEFILE64 @@ -114,8 +114,8 @@ struct stat64 __time_t st_ctime; /* Time of last status change. */ unsigned long int st_ctimensec; /* Nsecs of last status change. */ #endif - unsigned long int __unused4; - unsigned long int __unused5; + unsigned long int __uclibc_unused4; + unsigned long int __uclibc_unused5; }; #endif -- cgit v1.2.3