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/alpha/bits/ipc.h

@@ -49,6 +49,6 @@ struct ipc_perm
     unsigned int mode;			/* Read/write permission.  */
     unsigned short int __seq;		/* Sequence number.  */
     unsigned short int __pad1;
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
   };

libc/sysdeps/linux/alpha/bits/msq.h

@@ -45,8 +45,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 __uclibc_unused1;
-  unsigned long int __unused2;
+  unsigned long int __uclibc_unused2;
 };
 
 #ifdef __USE_MISC

libc/sysdeps/linux/alpha/bits/sem.h

@@ -41,8 +41,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 __uclibc_unused1;
-  unsigned long int __unused2;
+  unsigned long int __uclibc_unused2;
 };
 
 /* The user should define a union like the following to use it for arguments

libc/sysdeps/linux/alpha/bits/shm.h

@@ -56,8 +56,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 __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
   };
 
 #ifdef __USE_MISC
@@ -79,10 +79,10 @@ struct	shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
-    unsigned long int __unused4;
+    unsigned long int __uclibc_unused4;
   };
 
 struct shm_info

libc/sysdeps/linux/alpha/bits/stat.h

@@ -89,7 +89,7 @@ struct stat
     __ST_TIME(a);		/* Time of last access.  */
     __ST_TIME(m);		/* Time of last modification.  */
     __ST_TIME(c);		/* Time of last status change.  */
-    long __unused[3];
+    long __uclibc_unused[3];
   };
 
 #ifdef __USE_LARGEFILE64
@@ -110,7 +110,7 @@ struct stat64
     __ST_TIME(a);		/* Time of last access.  */
     __ST_TIME(m);		/* Time of last modification.  */
     __ST_TIME(c);		/* Time of last status change.  */
-    long __unused[3];
+    long __uclibc_unused[3];
   };
 #endif
 

libc/sysdeps/linux/arm/bits/kernel_stat.h

@@ -29,8 +29,8 @@ struct kernel_stat {
 	struct timespec st_atim;
 	struct timespec st_mtim;
 	struct timespec st_ctim;
-	unsigned long  __unused4;
+	unsigned long  __uclibc_unused4;
-	unsigned long  __unused5;
+	unsigned long  __uclibc_unused5;
 };
 
 struct kernel_stat64 {

libc/sysdeps/linux/arm/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 __uclibc_unused4;
-    unsigned long int __unused5;
+    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 __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
-    unsigned long int __unused4;
+    unsigned long int __uclibc_unused4;
   };
 
 struct shm_info

libc/sysdeps/linux/bfin/bits/kernel_stat.h

@@ -21,8 +21,8 @@ struct kernel_stat {
 	struct timespec st_atim;
 	struct timespec st_mtim;
 	struct timespec st_ctim;
-	unsigned long  __unused4;
+	unsigned long  __uclibc_unused4;
-	unsigned long  __unused5;
+	unsigned long  __uclibc_unused5;
 };
 
 struct kernel_stat64 {

libc/sysdeps/linux/c6x/bits/ipc.h

@@ -49,6 +49,6 @@ struct ipc_perm
     __mode_t mode;                      /* Read/write permission.  */
     unsigned short int __seq;		/* Sequence number.  */
     unsigned short int __pad2;
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
   };

libc/sysdeps/linux/common-generic/bits/stat.h

@@ -68,8 +68,8 @@ struct stat
     int st_ctime;				/* Time of last status change. */
     unsigned int st_ctime_nsec;
 #endif
-    unsigned int __unused4;
+    unsigned int __uclibc_unused4;
-    unsigned int __unused5;
+    unsigned int __uclibc_unused5;
   } __ARCH_64BIT_ALIGNMENT__;
 
 
@@ -106,8 +106,8 @@ struct stat64
     int st_ctime;				/* Time of last status change. */
     unsigned int st_ctime_nsec;
 # endif
-    unsigned int __unused4;
+    unsigned int __uclibc_unused4;
-    unsigned int __unused5;
+    unsigned int __uclibc_unused5;
 };
 #endif
 

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 __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
   };

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 __uclibc_unused4;
-  unsigned long int __unused5;
+  unsigned long int __uclibc_unused5;
 };
 
 #ifdef __USE_MISC

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 __uclibc_unused3;
-  unsigned long int __unused4;
+  unsigned long int __uclibc_unused4;
 };
 
 /* The user should define a union like the following to use it for arguments

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 __uclibc_unused4;
-    unsigned long int __unused5;
+    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 __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
-    unsigned long int __unused4;
+    unsigned long int __uclibc_unused4;
   };
 
 struct shm_info

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 __uclibc_unused4;
-    unsigned long int __unused5;
+    unsigned long int __uclibc_unused5;
 #else
     __ino64_t st_ino;			/* File serial number.	*/
 #endif

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.  */

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.  */
 };
 
 

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;

libc/sysdeps/linux/cris/bits/kernel_stat.h

@@ -19,8 +19,8 @@ struct kernel_stat {
 	struct timespec st_atim;
 	struct timespec st_mtim;
 	struct timespec st_ctim;
-	unsigned long  __unused4;
+	unsigned long  __uclibc_unused4;
-	unsigned long  __unused5;
+	unsigned long  __uclibc_unused5;
 };
 
 /* This matches struct kernel_stat64 in glibc2.1, hence the absolutely

libc/sysdeps/linux/csky/bits/kernel_stat.h

@@ -34,8 +34,8 @@ struct kernel_stat {
 	struct timespec st_atim;
 	struct timespec st_mtim;
 	struct timespec st_ctim;
-	unsigned long  __unused4;
+	unsigned long  __uclibc_unused4;
-	unsigned long  __unused5;
+	unsigned long  __uclibc_unused5;
 };
 
 struct kernel_stat64 {

libc/sysdeps/linux/csky/bits/shm.h

@@ -40,16 +40,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 __uclibc_unused4;
-    unsigned long int __unused5;
+    unsigned long int __uclibc_unused5;
   };
 
 #ifdef __USE_MISC
@@ -71,10 +71,10 @@ struct	shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
-    unsigned long int __unused4;
+    unsigned long int __uclibc_unused4;
   };
 
 struct shm_info

libc/sysdeps/linux/frv/bits/kernel_stat.h

@@ -38,7 +38,7 @@ struct kernel_stat {
 	struct timespec st_mtim;
 	struct timespec st_ctim;
 
-	unsigned long long __unused4;
+	unsigned long long __uclibc_unused4;
 };
 
 struct kernel_stat64 {
@@ -68,7 +68,7 @@ struct kernel_stat64 {
 	struct timespec st_mtim;
 	struct timespec st_ctim;
 
-	unsigned long long __unused4;
+	unsigned long long __uclibc_unused4;
 };
 
 #endif	/*  _BITS_STAT_STRUCT_H */

libc/sysdeps/linux/frv/bits/stat.h

@@ -84,16 +84,16 @@ struct stat
 # define st_mtime st_mtim.tv_sec
 # define st_ctime st_ctim.tv_sec
 #else
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
     __time_t st_atime;			/* Time of last access.  */
 
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
     __time_t st_mtime;			/* Time of last modification.  */
 
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
     __time_t st_ctime;			/* Time of last status change.  */
 #endif
-    unsigned long long __unused4;
+    unsigned long long __uclibc_unused4;
 };
 
 #ifdef __USE_LARGEFILE64
@@ -131,16 +131,16 @@ struct stat64
 # define st_mtime st_mtim.tv_sec
 # define st_ctime st_ctim.tv_sec
 #else
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
     __time_t st_atime;			/* Time of last access.  */
 
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
     __time_t st_mtime;			/* Time of last modification.  */
 
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
     __time_t st_ctime;			/* Time of last status change.  */
 #endif
-    unsigned long long __unused4;
+    unsigned long long __uclibc_unused4;
 };
 #endif
 

libc/sysdeps/linux/hppa/bits/ipc.h

@@ -57,6 +57,6 @@ struct ipc_perm
 #endif
     unsigned short int __seq;		/* Sequence number.  */
     unsigned int __pad3;
-    unsigned long long int __unused1;
+    unsigned long long int __uclibc_unused1;
-    unsigned long long int __unused2;
+    unsigned long long int __uclibc_unused2;
   };

libc/sysdeps/linux/i386/bits/fenv.h

@@ -65,18 +65,18 @@ typedef unsigned short int fexcept_t;
 typedef struct
   {
     unsigned short int __control_word;
-    unsigned short int __unused1;
+    unsigned short int __uclibc_unused1;
     unsigned short int __status_word;
-    unsigned short int __unused2;
+    unsigned short int __uclibc_unused2;
     unsigned short int __tags;
-    unsigned short int __unused3;
+    unsigned short int __uclibc_unused3;
     unsigned int __eip;
     unsigned short int __cs_selector;
     unsigned int __opcode:11;
-    unsigned int __unused4:5;
+    unsigned int __uclibc_unused4:5;
     unsigned int __data_offset;
     unsigned short int __data_selector;
-    unsigned short int __unused5;
+    unsigned short int __uclibc_unused5;
   }
 fenv_t;
 

libc/sysdeps/linux/i386/bits/kernel_stat.h

@@ -20,8 +20,8 @@ struct kernel_stat {
 	struct timespec st_atim;
 	struct timespec st_mtim;
 	struct timespec st_ctim;
-	unsigned long  __unused4;
+	unsigned long  __uclibc_unused4;
-	unsigned long  __unused5;
+	unsigned long  __uclibc_unused5;
 };
 
 struct kernel_stat64 {

libc/sysdeps/linux/ia64/bits/ipc.h

@@ -48,6 +48,6 @@ struct ipc_perm
     __mode_t mode;			/* Read/write permission.  */
     unsigned short int __seq;		/* Sequence number.  */
     unsigned short int __pad1;
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
   };

libc/sysdeps/linux/ia64/bits/msq.h

@@ -40,8 +40,8 @@ struct msqid_ds
   unsigned long int 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 __uclibc_unused1;
-  unsigned long int __unused2;
+  unsigned long int __uclibc_unused2;
 };
 
 #ifdef __USE_MISC

libc/sysdeps/linux/ia64/bits/sem.h

@@ -43,8 +43,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 __uclibc_unused1;
-  unsigned long int __unused2;
+  unsigned long int __uclibc_unused2;
 };
 
 /* The user should define a union like the following to use it for arguments

libc/sysdeps/linux/ia64/bits/shm.h

@@ -51,8 +51,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 __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
   };
 
 #ifdef __USE_MISC
@@ -74,10 +74,10 @@ struct	shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
-    unsigned long int __unused4;
+    unsigned long int __uclibc_unused4;
   };
 
 struct shm_info

libc/sysdeps/linux/ia64/bits/stat.h

@@ -61,7 +61,7 @@ struct stat
 #endif
     __blksize_t st_blksize;	/* Optimal block size for I/O.  */
     __blkcnt_t st_blocks;	/* Nr. 512-byte blocks allocated.  */
-    long int __unused[3];
+    long int __uclibc_unused[3];
   };
 
 #ifdef __USE_LARGEFILE64
@@ -100,7 +100,7 @@ struct stat64
 #endif
     __blksize_t st_blksize;	/* Optimal block size for I/O.  */
     __blkcnt64_t st_blocks;	/* Nr. 512-byte blocks allocated.  */
-    long int __unused[3];
+    long int __uclibc_unused[3];
   };
 #endif
 

libc/sysdeps/linux/lm32/bits/kernel_stat.h

@@ -22,8 +22,8 @@ struct kernel_stat
         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 int    __unused4;
+        unsigned int    __uclibc_unused4;
-        unsigned int    __unused5;
+        unsigned int    __uclibc_unused5;
 };
 
 struct kernel_stat64
@@ -43,8 +43,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 int    __unused4;
+        unsigned int    __uclibc_unused4;
-        unsigned int    __unused5;
+        unsigned int    __uclibc_unused5;
 };
 
 #endif  /*  _BITS_STAT_STRUCT_H */

libc/sysdeps/linux/m68k/bits/kernel_stat.h

@@ -21,8 +21,8 @@ struct kernel_stat {
 	struct timespec st_atim;
 	struct timespec st_mtim;
 	struct timespec st_ctim;
-	unsigned long  __unused4;
+	unsigned long  __uclibc_unused4;
-	unsigned long  __unused5;
+	unsigned long  __uclibc_unused5;
 };
 
 struct kernel_stat64 {

libc/sysdeps/linux/m68k/bits/stat.h

@@ -82,8 +82,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 __uclibc_unused4;
-    unsigned long int __unused5;
+    unsigned long int __uclibc_unused5;
 #else
     __ino64_t st_ino;			/* File serial number.	*/
 #endif

libc/sysdeps/linux/metag/bits/ipc.h

@@ -49,6 +49,6 @@ struct ipc_perm
     unsigned int mode;			/* Read/write permission.  */
     unsigned short __seq;		/* Sequence number.  */
     unsigned short __pad1;
-    unsigned long __unused1;
+    unsigned long __uclibc_unused1;
-    unsigned long __unused2;
+    unsigned long __uclibc_unused2;
   };

libc/sysdeps/linux/mips/bits/ipc.h

@@ -49,6 +49,6 @@ struct ipc_perm
     unsigned int mode;			/* Read/write permission.  */
     unsigned short int __seq;		/* Sequence number.  */
     unsigned short int __pad1;
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
 };

libc/sysdeps/linux/mips/bits/msq.h

@@ -64,8 +64,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 __uclibc_unused4;
-  unsigned long int __unused5;
+  unsigned long int __uclibc_unused5;
 };
 
 #ifdef __USE_MISC

libc/sysdeps/linux/mips/bits/sem.h

@@ -41,8 +41,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 __uclibc_unused1;
-  unsigned long int __unused2;
+  unsigned long int __uclibc_unused2;
 };
 
 /* The user should define a union like the following to use it for arguments

libc/sysdeps/linux/mips/bits/shm.h

@@ -52,8 +52,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 __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
   };
 
 #ifdef __USE_MISC
@@ -74,10 +74,10 @@ struct shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
-    unsigned long int __unused4;
+    unsigned long int __uclibc_unused4;
   };
 
 struct shm_info

libc/sysdeps/linux/nds32/bits/kernel_stat.h

@@ -30,8 +30,8 @@ struct kernel_stat {
 	struct timespec	st_atim;
 	struct timespec	st_mtim;
 	struct timespec	st_ctim;
-	unsigned long  __unused4;
+	unsigned long  __uclibc_unused4;
-	unsigned long  __unused5;
+	unsigned long  __uclibc_unused5;
 };
 
 struct kernel_stat64 {

libc/sysdeps/linux/nds32/bits/shm.h

@@ -55,16 +55,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 __uclibc_unused4;
-    unsigned long int __unused5;
+    unsigned long int __uclibc_unused5;
   };
 
 #ifdef __USE_MISC
@@ -85,10 +85,10 @@ struct	shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
-    unsigned long int __unused4;
+    unsigned long int __uclibc_unused4;
   };
 
 struct shm_info

libc/sysdeps/linux/nds32/bits/stat.h

@@ -86,8 +86,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 __uclibc_unused4;
-    unsigned long int __unused5;
+    unsigned long int __uclibc_unused5;
 #else
     __ino64_t st_ino;			/* File serial number.	*/
 #endif

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 __uclibc_unused1;
-    unsigned long long int __unused2;
+    unsigned long long int __uclibc_unused2;
 #else
     __uint32_t __seq;		/* Sequence number.  */
     __uint32_t __pad1;
-    __uint64_t __unused1;
+    __uint64_t __uclibc_unused1;
-    __uint64_t __unused2;
+    __uint64_t __uclibc_unused2;
 #endif
   };

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 __uclibc_unused4;
-	unsigned long int __unused5;
+	unsigned long int __uclibc_unused5;
 };
 
 #endif	/*  _BITS_STAT_STRUCT_H */

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 __uclibc_unused4;
-  unsigned long __unused5;
+  unsigned long __uclibc_unused5;
 };
 
 #ifdef __USE_MISC

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 __uclibc_unused3;
-  unsigned long __unused4;
+  unsigned long __uclibc_unused4;
 };
 
 /* The user should define a union like the following to use it for arguments

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 __uclibc_unused5;
-    unsigned long __unused6;
+    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 __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
-    unsigned long int __unused4;
+    unsigned long int __uclibc_unused4;
   };
 
 struct shm_info

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 __uclibc_unused4;
-    unsigned long int __unused5;
+    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 __uclibc_unused4;
-    unsigned long int __unused5;
+    unsigned long int __uclibc_unused5;
   };
 # endif /* __USE_LARGEFILE64 */
 

libc/sysdeps/linux/riscv64/bits/shm.h

@@ -38,16 +38,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 __uclibc_unused4;
-    unsigned long int __unused5;
+    unsigned long int __uclibc_unused5;
   };
 
 #ifdef __USE_MISC
@@ -69,10 +69,10 @@ struct	shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
-    unsigned long int __unused4;
+    unsigned long int __uclibc_unused4;
   };
 
 struct shm_info

libc/sysdeps/linux/sh/bits/kernel_stat.h

@@ -22,8 +22,8 @@ struct kernel_stat {
 	struct timespec st_atim;
 	struct timespec st_mtim;
 	struct timespec st_ctim;
-	unsigned long  __unused4;
+	unsigned long  __uclibc_unused4;
-	unsigned long  __unused5;
+	unsigned long  __uclibc_unused5;
 };
 
 struct kernel_stat64 {

libc/sysdeps/linux/sh/bits/shm.h

@@ -56,16 +56,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 __uclibc_unused4;
-    unsigned long int __unused5;
+    unsigned long int __uclibc_unused5;
   };
 
 #ifdef __USE_MISC
@@ -87,10 +87,10 @@ struct	shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
-    unsigned long int __unused4;
+    unsigned long int __uclibc_unused4;
   };
 
 struct shm_info

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
 

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 __uclibc_unused1;
-    unsigned long long int __unused2;
+    unsigned long long int __uclibc_unused2;
   };

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 __uclibc_unused1;
-  unsigned long int __unused2;
+  unsigned long int __uclibc_unused2;
 };
 
 #ifdef __USE_MISC

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 __uclibc_unused1;
-  unsigned long int __unused2;
+  unsigned long int __uclibc_unused2;
 };
 
 /* The user should define a union like the following to use it for arguments

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 __uclibc_unused1;
-    unsigned long int __unused2;
+    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 __uclibc_unused1;
-    unsigned long __unused2;
+    unsigned long __uclibc_unused2;
-    unsigned long __unused3;
+    unsigned long __uclibc_unused3;
-    unsigned long __unused4;
+    unsigned long __uclibc_unused4;
   };
 
 struct shm_info

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 __uclibc_unused4;
-    unsigned long int __unused5;
+    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 __uclibc_unused4;
-    unsigned long int __unused5;
+    unsigned long int __uclibc_unused5;
   };
 #endif
 

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
 

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 __uclibc_unused1;
-    unsigned long long int __unused2;
+    unsigned long long int __uclibc_unused2;
   };

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 __uclibc_unused1;
-  unsigned long int __unused2;
+  unsigned long int __uclibc_unused2;
 };
 
 #ifdef __USE_MISC

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 __uclibc_unused1;
-  unsigned long int __unused2;
+  unsigned long int __uclibc_unused2;
 };
 
 /* The user should define a union like the following to use it for arguments

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 __uclibc_unused1;
-    unsigned long int __unused2;
+    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 __uclibc_unused1;
-    unsigned long __unused2;
+    unsigned long __uclibc_unused2;
-    unsigned long __unused3;
+    unsigned long __uclibc_unused3;
-    unsigned long __unused4;
+    unsigned long __uclibc_unused4;
   };
 
 struct shm_info

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 __uclibc_unused4;
-    unsigned long int __unused5;
+    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 __uclibc_unused4;
-    unsigned long int __unused5;
+    unsigned long int __uclibc_unused5;
   };
 #endif
 

libc/sysdeps/linux/tile/bits/shm.h

@@ -38,16 +38,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 __uclibc_unused4;
-    unsigned long int __unused5;
+    unsigned long int __uclibc_unused5;
   };
 
 #ifdef __USE_MISC
@@ -69,10 +69,10 @@ struct	shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
-    unsigned long int __unused4;
+    unsigned long int __uclibc_unused4;
   };
 
 struct shm_info

libc/sysdeps/linux/x86_64/bits/fenv.h

@@ -69,18 +69,18 @@ typedef unsigned short int fexcept_t;
 typedef struct
   {
     unsigned short int __control_word;
-    unsigned short int __unused1;
+    unsigned short int __uclibc_unused1;
     unsigned short int __status_word;
-    unsigned short int __unused2;
+    unsigned short int __uclibc_unused2;
     unsigned short int __tags;
-    unsigned short int __unused3;
+    unsigned short int __uclibc_unused3;
     unsigned int __eip;
     unsigned short int __cs_selector;
     unsigned int __opcode:11;
-    unsigned int __unused4:5;
+    unsigned int __uclibc_unused4:5;
     unsigned int __data_offset;
     unsigned short int __data_selector;
-    unsigned short int __unused5;
+    unsigned short int __uclibc_unused5;
 #if __WORDSIZE == 64
     unsigned int __mxcsr;
 #endif

libc/sysdeps/linux/x86_64/bits/kernel_stat.h

@@ -21,7 +21,7 @@ struct kernel_stat {
 	struct timespec st_atim;
 	struct timespec st_mtim;
 	struct timespec st_ctim;
-	long           __unused[3];
+	long           __uclibc_unused[3];
 };
 
 /* x86-64 stat64 is same as stat */

libc/sysdeps/linux/x86_64/bits/msq.h

@@ -39,23 +39,23 @@ struct msqid_ds
   struct ipc_perm msg_perm;	/* structure describing operation permission */
   __time_t msg_stime;		/* time of last msgsnd command */
 #if __WORDSIZE == 32
-  unsigned long int __unused1;
+  unsigned long int __uclibc_unused1;
 #endif
   __time_t msg_rtime;		/* time of last msgrcv command */
 #if __WORDSIZE == 32
-  unsigned long int __unused2;
+  unsigned long int __uclibc_unused2;
 #endif
   __time_t msg_ctime;		/* time of last change */
 #if __WORDSIZE == 32
-  unsigned long int __unused3;
+  unsigned long int __uclibc_unused3;
 #endif
   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 __uclibc_unused4;
-  unsigned long int __unused5;
+  unsigned long int __uclibc_unused5;
 };
 
 #ifdef __USE_MISC

libc/sysdeps/linux/x86_64/bits/sem.h

@@ -39,12 +39,12 @@ struct semid_ds
 {
   struct ipc_perm sem_perm;		/* operation permission struct */
   __time_t sem_otime;			/* last semop() time */
-  unsigned long int __unused1;
+  unsigned long int __uclibc_unused1;
   __time_t sem_ctime;			/* last time changed by semctl() */
-  unsigned long int __unused2;
+  unsigned long int __uclibc_unused2;
   unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __unused3;
+  unsigned long int __uclibc_unused3;
-  unsigned long int __unused4;
+  unsigned long int __uclibc_unused4;
 };
 
 /* The user should define a union like the following to use it for arguments

libc/sysdeps/linux/x86_64/bits/shm.h

@@ -52,21 +52,21 @@ struct shmid_ds
     size_t shm_segsz;			/* size of segment in bytes */
     __time_t shm_atime;			/* time of last shmat() */
 #if __WORDSIZE == 32
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
 #endif
     __time_t shm_dtime;			/* time of last shmdt() */
 #if __WORDSIZE == 32
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
 #endif
     __time_t shm_ctime;			/* time of last change by shmctl() */
 #if __WORDSIZE == 32
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
 #endif
     __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 __uclibc_unused4;
-    unsigned long int __unused5;
+    unsigned long int __uclibc_unused5;
   };
 
 #ifdef __USE_MISC
@@ -88,10 +88,10 @@ struct	shminfo
     unsigned long int shmmni;
     unsigned long int shmseg;
     unsigned long int shmall;
-    unsigned long int __unused1;
+    unsigned long int __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
-    unsigned long int __unused4;
+    unsigned long int __uclibc_unused4;
   };
 
 struct shm_info

libc/sysdeps/linux/x86_64/bits/stat.h

@@ -99,11 +99,11 @@ struct stat
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
 #endif
 #if __WORDSIZE == 64
-    long int __unused[3];
+    long int __uclibc_unused[3];
 #else
 # ifndef __USE_FILE_OFFSET64
-    unsigned long int __unused4;
+    unsigned long int __uclibc_unused4;
-    unsigned long int __unused5;
+    unsigned long int __uclibc_unused5;
 # else
     __ino64_t st_ino;			/* File serial number.	*/
 # endif
@@ -160,7 +160,7 @@ struct stat64
     unsigned long int st_ctimensec;	/* Nsecs of last status change.  */
 #endif
 #if __WORDSIZE == 64
-    long int __unused[3];
+    long int __uclibc_unused[3];
 #else
     __ino64_t st_ino;			/* File serial number.		*/
 #endif

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 __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
   };

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 __uclibc_unused4;
-	unsigned long __unused5;
+	unsigned long __uclibc_unused5;
 };
 
 #endif	/* _BITS_STAT_STRUCT_H */

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 __uclibc_unused4;
-  unsigned long int __unused5;
+  unsigned long int __uclibc_unused5;
 };
 
 #ifdef __USE_MISC

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 __uclibc_unused4;
-    unsigned long int __unused5;
+    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 __uclibc_unused1;
-    unsigned long int __unused2;
+    unsigned long int __uclibc_unused2;
-    unsigned long int __unused3;
+    unsigned long int __uclibc_unused3;
-    unsigned long int __unused4;
+    unsigned long int __uclibc_unused4;
   };
 
 struct shm_info

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 __uclibc_unused4;
-    unsigned long int __unused5;
+    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 __uclibc_unused4;
-    unsigned long __unused5;
+    unsigned long __uclibc_unused5;
   };
 #endif
 

libpthread/nptl/sysdeps/i386/tls.h

@@ -55,7 +55,7 @@ typedef struct
 #ifndef __ASSUME_PRIVATE_FUTEX
   int private_futex;
 #else
-  int __unused1;
+  int __uclibc_unused1;
 #endif
   /* Reservation of some values for the TM ABI.  */
   void *__private_tm[5];

libpthread/nptl/sysdeps/x86_64/tls.h

@@ -58,7 +58,7 @@ typedef struct
 # ifndef __ASSUME_PRIVATE_FUTEX
   int private_futex;
 # else
-  int __unused1;
+  int __uclibc_unused1;
 # endif
 # if __WORDSIZE == 64
   int rtld_must_xmm_save;
@@ -66,7 +66,7 @@ typedef struct
   /* Reservation of some values for the TM ABI.  */
   void *__private_tm[5];
 # if __WORDSIZE == 64
-  long int __unused2;
+  long int __uclibc_unused2;
   /* Have space for the post-AVX register size.  */
   __m128 rtld_savespace_sse[8][4];