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

6 files changed, 29 insertions, 29 deletions

diff --git a/libc/sysdeps/linux/powerpc/bits/ipc.h b/libc/sysdeps/linux/powerpc/bits/ipc.h
index e21debf5d..f40ffbc24 100644
--- a/libc/sysdeps/linux/powerpc/bits/ipc.h
+++ b/libc/sysdeps/linux/powerpc/bits/ipc.h
@@ -50,12 +50,12 @@ struct ipc_perm
 #if 0
     unsigned long __seq;	/* Sequence number. */
     unsigned int __pad2;
-    unsigned long long int __unused1;
-    unsigned long long int __unused2;
+    unsigned long long int __uclibc_unused1;
+    unsigned long long int __uclibc_unused2;
 #else
     __uint32_t __seq;		/* Sequence number.  */
     __uint32_t __pad1;
-    __uint64_t __unused1;
-    __uint64_t __unused2;
+    __uint64_t __uclibc_unused1;
+    __uint64_t __uclibc_unused2;
 #endif
   };
diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_stat.h b/libc/sysdeps/linux/powerpc/bits/kernel_stat.h
index 579b5b4e2..ce62b2ba2 100644
--- a/libc/sysdeps/linux/powerpc/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/powerpc/bits/kernel_stat.h
@@ -42,8 +42,8 @@ struct kernel_stat64 {
 	struct timespec st_atim;	/* Time of last access.  */
 	struct timespec st_mtim;	/* Time of last modification.  */
 	struct timespec st_ctim;	/* Time of last status change.  */
-	unsigned long int __unused4;
-	unsigned long int __unused5;
+	unsigned long int __uclibc_unused4;
+	unsigned long int __uclibc_unused5;
 };
 
 #endif	/*  _BITS_STAT_STRUCT_H */
diff --git a/libc/sysdeps/linux/powerpc/bits/msq.h b/libc/sysdeps/linux/powerpc/bits/msq.h
index 70d4f06e3..995f5157b 100644
--- a/libc/sysdeps/linux/powerpc/bits/msq.h
+++ b/libc/sysdeps/linux/powerpc/bits/msq.h
@@ -38,15 +38,15 @@ struct msqid_ds
 {
   struct ipc_perm msg_perm;    /* structure describing operation permission */
 #if __WORDSIZE == 32
-  unsigned int __unused1;
+  unsigned int __uclibc_unused1;
 #endif
   __time_t msg_stime;          /* time of last msgsnd command */
 #if __WORDSIZE == 32
-  unsigned int __unused2;
+  unsigned int __uclibc_unused2;
 #endif
   __time_t msg_rtime;          /* time of last msgrcv command */
 #if __WORDSIZE == 32
-  unsigned int __unused3;
+  unsigned int __uclibc_unused3;
 #endif
   __time_t msg_ctime;          /* time of last change */
   unsigned long __msg_cbytes; /* current number of bytes on queue */
@@ -54,8 +54,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 __unused4;
-  unsigned long __unused5;
+  unsigned long __uclibc_unused4;
+  unsigned long __uclibc_unused5;
 };
 
 #ifdef __USE_MISC
diff --git a/libc/sysdeps/linux/powerpc/bits/sem.h b/libc/sysdeps/linux/powerpc/bits/sem.h
index 271a607ca..a9d895374 100644
--- a/libc/sysdeps/linux/powerpc/bits/sem.h
+++ b/libc/sysdeps/linux/powerpc/bits/sem.h
@@ -40,16 +40,16 @@ struct semid_ds
 {
   struct ipc_perm sem_perm;            /* operation permission struct */
 #if __WORDSIZE == 32
-  unsigned int __unused1;
+  unsigned int __uclibc_unused1;
 #endif
   __time_t sem_otime;                  /* last semop() time */
 #if __WORDSIZE == 32
-  unsigned int __unused2;
+  unsigned int __uclibc_unused2;
 #endif
   __time_t sem_ctime;                  /* last time changed by semctl() */
   unsigned long int sem_nsems;         /* number of semaphores in set */
-  unsigned long __unused3;
-  unsigned long __unused4;
+  unsigned long __uclibc_unused3;
+  unsigned long __uclibc_unused4;
 };
 
 /* The user should define a union like the following to use it for arguments
diff --git a/libc/sysdeps/linux/powerpc/bits/shm.h b/libc/sysdeps/linux/powerpc/bits/shm.h
index 63e7f6ed1..7ba17f8ad 100644
--- a/libc/sysdeps/linux/powerpc/bits/shm.h
+++ b/libc/sysdeps/linux/powerpc/bits/shm.h
@@ -50,26 +50,26 @@ struct shmid_ds
   {
     struct ipc_perm shm_perm;          /* operation permission struct */
 #if __WORDSIZE == 32
-    unsigned int __unused1;
+    unsigned int __uclibc_unused1;
 #endif
     __time_t shm_atime;                        /* time of last shmat() */
 #if __WORDSIZE == 32
-    unsigned int __unused2;
+    unsigned int __uclibc_unused2;
 #endif
     __time_t shm_dtime;                        /* time of last shmdt() */
 #if __WORDSIZE == 32
-    unsigned int __unused3;
+    unsigned int __uclibc_unused3;
 #endif
     __time_t shm_ctime;			/* time of last change by shmctl() */
 #if __WORDSIZE == 32
-    unsigned int __unused4;
+    unsigned int __uclibc_unused4;
 #endif
     size_t shm_segsz;                  /* size of segment in bytes */
     __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 __unused5;
-    unsigned long __unused6;
+    unsigned long __uclibc_unused5;
+    unsigned long __uclibc_unused6;
   };
 
 #ifdef __USE_MISC
@@ -91,10 +91,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/powerpc/bits/stat.h b/libc/sysdeps/linux/powerpc/bits/stat.h
index a90043f8a..7494586b5 100644
--- a/libc/sysdeps/linux/powerpc/bits/stat.h
+++ b/libc/sysdeps/linux/powerpc/bits/stat.h
@@ -80,8 +80,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;
   };
 
 
@@ -120,8 +120,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 /* __USE_LARGEFILE64 */