7 files changed, 26 insertions, 26 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/bits/ipc.h b/sysdeps/unix/sysv/linux/s390/bits/ipc.h
index 39519a4a1c..1493af7967 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/ipc.h
+++ b/sysdeps/unix/sysv/linux/s390/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 __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
   };
diff --git a/sysdeps/unix/sysv/linux/s390/bits/msq.h b/sysdeps/unix/sysv/linux/s390/bits/msq.h
index a5eaf89ddf..e2a7e03710 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/msq.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/msq.h
@@ -41,23 +41,23 @@ struct msqid_ds
   struct ipc_perm msg_perm;	/* structure describing operation permission */
   __time_t msg_stime;		/* time of last msgsnd command */
 #if __WORDSIZE != 64
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
 #endif
   __time_t msg_rtime;		/* time of last msgrcv command */
 #if __WORDSIZE != 64
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
 #endif
   __time_t msg_ctime;		/* time of last change */
 #if __WORDSIZE != 64
-  unsigned long int __unused3;
+  unsigned long int __glibc_reserved3;
 #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 __unused5;
+  unsigned long int __glibc_reserved4;
+  unsigned long int __glibc_reserved5;
 };
 
 #ifdef __USE_MISC
diff --git a/sysdeps/unix/sysv/linux/s390/bits/sem.h b/sysdeps/unix/sysv/linux/s390/bits/sem.h
index fe94448caa..7bfc477e27 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/sem.h
+++ b/sysdeps/unix/sysv/linux/s390/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 != 64
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
 #endif
   __time_t sem_ctime;			/* last time changed by semctl() */
 #if __WORDSIZE != 64
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
 #endif
   unsigned long int sem_nsems;		/* number of semaphores in set */
-  unsigned long int __unused3;
-  unsigned long int __unused4;
+  unsigned long int __glibc_reserved3;
+  unsigned long int __glibc_reserved4;
 };
 
 /* The user should define a union like the following to use it for arguments
diff --git a/sysdeps/unix/sysv/linux/s390/bits/shm.h b/sysdeps/unix/sysv/linux/s390/bits/shm.h
index c678219e9c..358e617a7d 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/shm.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/shm.h
@@ -53,21 +53,21 @@ struct shmid_ds
     size_t shm_segsz;			/* size of segment in bytes */
     __time_t shm_atime;			/* time of last shmat() */
 #if __WORDSIZE != 64
-  unsigned long int __unused1;
+  unsigned long int __glibc_reserved1;
 #endif
     __time_t shm_dtime;			/* time of last shmdt() */
 #if __WORDSIZE != 64
-  unsigned long int __unused2;
+  unsigned long int __glibc_reserved2;
 #endif
     __time_t shm_ctime;			/* time of last change by shmctl() */
 #if __WORDSIZE != 64
-  unsigned long int __unused3;
+  unsigned long int __glibc_reserved3;
 #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 __unused5;
+    unsigned long int __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
   };
 
 #ifdef __USE_MISC
@@ -89,10 +89,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 __glibc_reserved1;
+    unsigned long int __glibc_reserved2;
+    unsigned long int __glibc_reserved3;
+    unsigned long int __glibc_reserved4;
   };
 
 struct shm_info
diff --git a/sysdeps/unix/sysv/linux/s390/bits/stat.h b/sysdeps/unix/sysv/linux/s390/bits/stat.h
index 5d1e222dbb..51be598ebb 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/stat.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/stat.h
@@ -81,7 +81,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 __glibc_reserved[3];
   };
 #else
 struct stat
@@ -133,8 +133,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 __glibc_reserved4;
+    unsigned long int __glibc_reserved5;
 # else
     __ino64_t st_ino;			/* File serial number.	*/
 # endif
@@ -178,7 +178,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 __glibc_reserved[3];
   };
 # else
 struct stat64
diff --git a/sysdeps/unix/sysv/linux/s390/bits/utmp.h b/sysdeps/unix/sysv/linux/s390/bits/utmp.h
index a46470ffcf..96c1c99ffc 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/utmp.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/utmp.h
@@ -81,7 +81,7 @@ struct utmp
 #endif
 
   int32_t ut_addr_v6[4];	/* Internet address of remote host.  */
-  char __unused[20];		/* Reserved for future use.  */
+  char __glibc_reserved[20];		/* Reserved for future use.  */
 };
 
 /* Backwards compatibility hacks.  */
diff --git a/sysdeps/unix/sysv/linux/s390/bits/utmpx.h b/sysdeps/unix/sysv/linux/s390/bits/utmpx.h
index 1fba0b6da6..cb6067b93a 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/utmpx.h
+++ b/sysdeps/unix/sysv/linux/s390/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 __glibc_reserved[20];		/* Reserved for future use.  */
 };