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, 18 insertions, 18 deletions

diff --git a/libc/sysdeps/linux/sparc64/bits/fcntl.h b/libc/sysdeps/linux/sparc64/bits/fcntl.h
index dad3470b8..2443a92c8 100644
--- a/libc/sysdeps/linux/sparc64/bits/fcntl.h
+++ b/libc/sysdeps/linux/sparc64/bits/fcntl.h
@@ -159,7 +159,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
@@ -170,7 +170,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/sparc64/bits/ipc.h b/libc/sysdeps/linux/sparc64/bits/ipc.h
index 7fedafa61..56247ab4e 100644
--- a/libc/sysdeps/linux/sparc64/bits/ipc.h
+++ b/libc/sysdeps/linux/sparc64/bits/ipc.h
@@ -48,6 +48,6 @@ struct ipc_perm
     __mode_t mode;			/* Read/write permission.  */
     unsigned short int __pad1;
     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/sparc64/bits/msq.h b/libc/sysdeps/linux/sparc64/bits/msq.h
index f514e442c..f31caf2f7 100644
--- a/libc/sysdeps/linux/sparc64/bits/msq.h
+++ b/libc/sysdeps/linux/sparc64/bits/msq.h
@@ -44,8 +44,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/sparc64/bits/sem.h b/libc/sysdeps/linux/sparc64/bits/sem.h
index acc21742d..9e88db2e2 100644
--- a/libc/sysdeps/linux/sparc64/bits/sem.h
+++ b/libc/sysdeps/linux/sparc64/bits/sem.h
@@ -40,8 +40,8 @@ struct semid_ds
   __time_t sem_otime;			/* last semop() time */
   __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/sparc64/bits/shm.h b/libc/sysdeps/linux/sparc64/bits/shm.h
index a5d8c3464..b76c4c32b 100644
--- a/libc/sysdeps/linux/sparc64/bits/shm.h
+++ b/libc/sysdeps/linux/sparc64/bits/shm.h
@@ -55,8 +55,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
@@ -78,10 +78,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/sparc64/bits/stat.h b/libc/sysdeps/linux/sparc64/bits/stat.h
index cae973b4e..8516b159c 100644
--- a/libc/sysdeps/linux/sparc64/bits/stat.h
+++ b/libc/sysdeps/linux/sparc64/bits/stat.h
@@ -79,8 +79,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
@@ -122,8 +122,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