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

8 files changed, 25 insertions, 25 deletions

diff --git a/libc/sysdeps/linux/common/bits/ipc.h b/libc/sysdeps/linux/common/bits/ipc.h
index ca7f58cc7..cf7da2a29 100644
--- a/libc/sysdeps/linux/common/bits/ipc.h
+++ b/libc/sysdeps/linux/common/bits/ipc.h
@@ -55,6 +55,6 @@ struct ipc_perm
 #endif
     unsigned short int __seq;		/* Sequence number.  */
     unsigned short int __pad2;
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused1;
+    unsigned long int __uclibc_unused2;
   };
diff --git a/libc/sysdeps/linux/common/bits/msq.h b/libc/sysdeps/linux/common/bits/msq.h
index a1c3ea43d..b594cfff2 100644
--- a/libc/sysdeps/linux/common/bits/msq.h
+++ b/libc/sysdeps/linux/common/bits/msq.h
@@ -38,18 +38,18 @@ struct msqid_ds
 {
   struct ipc_perm msg_perm;	/* structure describing operation permission */
   __time_t msg_stime;		/* time of last msgsnd command */
-  unsigned long int __unused1;
+  unsigned long int __uclibc_unused1;
   __time_t msg_rtime;		/* time of last msgrcv command */
-  unsigned long int __unused2;
+  unsigned long int __uclibc_unused2;
   __time_t msg_ctime;		/* time of last change */
-  unsigned long int __unused3;
+  unsigned long int __uclibc_unused3;
   unsigned long int __msg_cbytes; /* current number of bytes on queue */
   msgqnum_t msg_qnum;		/* number of messages currently on queue */
   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 __unused4;
-  unsigned long int __unused5;
+  unsigned long int __uclibc_unused4;
+  unsigned long int __uclibc_unused5;
 };
 
 #ifdef __USE_MISC
diff --git a/libc/sysdeps/linux/common/bits/sem.h b/libc/sysdeps/linux/common/bits/sem.h
index 3fb10d42f..910c4b714 100644
--- a/libc/sysdeps/linux/common/bits/sem.h
+++ b/libc/sysdeps/linux/common/bits/sem.h
@@ -41,15 +41,15 @@ struct semid_ds
   struct ipc_perm sem_perm;		/* operation permission struct */
   __time_t sem_otime;			/* last semop() time */
 #if __WORDSIZE == 32
-  unsigned long int __unused1;
+  unsigned long int __uclibc_unused1;
 #endif
   __time_t sem_ctime;			/* last time changed by semctl() */
 #if __WORDSIZE == 32
-  unsigned long int __unused2;
+  unsigned long int __uclibc_unused2;
 #endif
   unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __unused3;
-  unsigned long int __unused4;
+  unsigned long int __uclibc_unused3;
+  unsigned long int __uclibc_unused4;
 };
 
 /* The user should define a union like the following to use it for arguments
diff --git a/libc/sysdeps/linux/common/bits/shm.h b/libc/sysdeps/linux/common/bits/shm.h
index 88bf7a8aa..8906e262b 100644
--- a/libc/sysdeps/linux/common/bits/shm.h
+++ b/libc/sysdeps/linux/common/bits/shm.h
@@ -50,16 +50,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
@@ -81,10 +81,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/common/bits/stat.h b/libc/sysdeps/linux/common/bits/stat.h
index 19e2f4e13..07c09f50a 100644
--- a/libc/sysdeps/linux/common/bits/stat.h
+++ b/libc/sysdeps/linux/common/bits/stat.h
@@ -83,8 +83,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
diff --git a/libc/sysdeps/linux/common/bits/utmp.h b/libc/sysdeps/linux/common/bits/utmp.h
index 6ece31e34..9671d9382 100644
--- a/libc/sysdeps/linux/common/bits/utmp.h
+++ b/libc/sysdeps/linux/common/bits/utmp.h
@@ -82,7 +82,7 @@ struct utmp
 #endif
 
   int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
-  char __unused[20];		/* Reserved for future use.  */
+  char __uclibc_unused[20];	/* Reserved for future use.  */
 };
 
 /* Backwards compatibility hacks.  */
diff --git a/libc/sysdeps/linux/common/bits/utmpx.h b/libc/sysdeps/linux/common/bits/utmpx.h
index 815fc90b8..3315ef5e6 100644
--- a/libc/sysdeps/linux/common/bits/utmpx.h
+++ b/libc/sysdeps/linux/common/bits/utmpx.h
@@ -78,7 +78,7 @@ struct utmpx
   struct timeval ut_tv;		/* Time entry was made.  */
 #endif
   __int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
-  char __unused[20];		/* Reserved for future use.  */
+  char __uclibc_unused[20];	/* Reserved for future use.  */
 };
 
 
diff --git a/libc/sysdeps/linux/common/sysctl.c b/libc/sysdeps/linux/common/sysctl.c
index 75f9236d0..d3e28f919 100644
--- a/libc/sysdeps/linux/common/sysctl.c
+++ b/libc/sysdeps/linux/common/sysctl.c
@@ -17,7 +17,7 @@ struct __sysctl_args {
 	size_t *oldlenp;
 	void *newval;
 	size_t newlen;
-	unsigned long __unused[4];
+	unsigned long __uclibc_unused[4];
 };
 extern int sysctl (int *__name, int __nlen, void *__oldval,
 				   size_t *__oldlenp, void *__newval, size_t __newlen) __THROW;