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

5 files changed, 29 insertions, 29 deletions

diff --git a/libc/sysdeps/linux/xtensa/bits/ipc.h b/libc/sysdeps/linux/xtensa/bits/ipc.h
index 2ad5fc0a2..f4222de8c 100644
--- a/libc/sysdeps/linux/xtensa/bits/ipc.h
+++ b/libc/sysdeps/linux/xtensa/bits/ipc.h
@@ -48,6 +48,6 @@ struct ipc_perm
     __gid_t cgid;			/* Creator's group ID.  */
     unsigned int mode;			/* Read/write permission.  */
     unsigned int __seq;			/* Sequence number.  */
-    unsigned long int __unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused1;
+    unsigned long int __uclibc_unused2;
   };
diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_stat.h b/libc/sysdeps/linux/xtensa/bits/kernel_stat.h
index 5e4f5c4e5..d884344d3 100644
--- a/libc/sysdeps/linux/xtensa/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/xtensa/bits/kernel_stat.h
@@ -33,13 +33,13 @@ struct kernel_stat64 {
 	unsigned long long st_rdev;	/* Device number, if device. */
 	long long st_size;		/* Size of file, in bytes. */
 	unsigned long st_blksize;	/* Optimal block size for I/O. */
-	unsigned long __unused2;
+	unsigned long __uclibc_unused2;
 	unsigned long long st_blocks;	/* Number 512-byte blocks allocated. */
 	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 __unused4;
-	unsigned long __unused5;
+	unsigned long __uclibc_unused4;
+	unsigned long __uclibc_unused5;
 };
 
 #endif	/* _BITS_STAT_STRUCT_H */
diff --git a/libc/sysdeps/linux/xtensa/bits/msq.h b/libc/sysdeps/linux/xtensa/bits/msq.h
index e4f3fa317..0f65b4274 100644
--- a/libc/sysdeps/linux/xtensa/bits/msq.h
+++ b/libc/sysdeps/linux/xtensa/bits/msq.h
@@ -38,19 +38,19 @@ struct msqid_ds
 {
   struct ipc_perm msg_perm;	/* structure describing operation permission */
 #if defined (__XTENSA_EB__)
-  unsigned long int __unused1;
+  unsigned long int __uclibc_unused1;
   __time_t msg_stime;		/* time of last msgsnd command */
-  unsigned long int __unused2;
+  unsigned long int __uclibc_unused2;
   __time_t msg_rtime;		/* time of last msgrcv command */
-  unsigned long int __unused3;
+  unsigned long int __uclibc_unused3;
   __time_t msg_ctime;		/* time of last change */
 #elif defined (__XTENSA_EL__)
   __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;
 #else
 # error endian order not defined
 #endif
@@ -59,8 +59,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 __unused4;
-  unsigned long int __unused5;
+  unsigned long int __uclibc_unused4;
+  unsigned long int __uclibc_unused5;
 };
 
 #ifdef __USE_MISC
diff --git a/libc/sysdeps/linux/xtensa/bits/shm.h b/libc/sysdeps/linux/xtensa/bits/shm.h
index d288a1cca..d1e13cb49 100644
--- a/libc/sysdeps/linux/xtensa/bits/shm.h
+++ b/libc/sysdeps/linux/xtensa/bits/shm.h
@@ -52,17 +52,17 @@ struct shmid_ds
     size_t shm_segsz;			/* size of segment in bytes */
 #if defined (__XTENSA_EL__)
     __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;
 #elif defined (__XTENSA_EB__)
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
     __time_t shm_atime;			/* time of last shmat() */
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
     __time_t shm_dtime;			/* time of last shmdt() */
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
     __time_t shm_ctime;			/* time of last change by shmctl() */
 #else
 # error endian order not defined
@@ -70,8 +70,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 __unused4;
-    unsigned long int __unused5;
+    unsigned long int __uclibc_unused4;
+    unsigned long int __uclibc_unused5;
   };
 
 #ifdef __USE_MISC
@@ -93,10 +93,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/xtensa/bits/stat.h b/libc/sysdeps/linux/xtensa/bits/stat.h
index c61b188b7..045a017fd 100644
--- a/libc/sysdeps/linux/xtensa/bits/stat.h
+++ b/libc/sysdeps/linux/xtensa/bits/stat.h
@@ -75,8 +75,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
@@ -112,8 +112,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 __unused4;
-    unsigned long __unused5;
+    unsigned long __uclibc_unused4;
+    unsigned long __uclibc_unused5;
   };
 #endif