This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH] Use __unused.0 instead of __unused for user visible struct members
- From: "Carlos O'Donell" <carlos at redhat dot com>
- To: OndÅej BÃlka <neleai at seznam dot cz>
- Cc: Justin Cormack <justin at specialbusservice dot com>, "Joseph S. Myers" <joseph at codesourcery dot com>, libc-alpha at sourceware dot org
- Date: Wed, 13 Nov 2013 11:55:50 -0500
- Subject: Re: [PATCH] Use __unused.0 instead of __unused for user visible struct members
- Authentication-results: sourceware.org; auth=none
- References: <CAK4o1WzkMk8nV2jzM38peutbMWuKBPTeh5dbfwSiDhankAT=Yw at mail dot gmail dot com> <Pine dot LNX dot 4 dot 64 dot 1310281328500 dot 25699 at digraph dot polyomino dot org dot uk> <CAK4o1WxO9=qbKUiJtZtS+Q9Wyo8EfNrO_H8=J_w=zcQP822Dvw at mail dot gmail dot com> <20131105135404 dot GA20687 at domone dot podge> <528303CA dot 3050901 at redhat dot com> <20131113110951 dot GA2926 at domone dot podge>
On 11/13/2013 06:09 AM, OndÅej BÃlka wrote:
> On Tue, Nov 12, 2013 at 11:44:58PM -0500, Carlos O'Donell wrote:
>> On 11/05/2013 08:54 AM, OndÅej BÃlka wrote:
>>> On Mon, Oct 28, 2013 at 03:41:18PM +0000, Justin Cormack wrote:
>>>> On Mon, Oct 28, 2013 at 1:30 PM, Joseph S. Myers
>>>> <joseph@codesourcery.com> wrote:
>>>>> On Mon, 28 Oct 2013, Justin Cormack wrote:
>>>>>
>>>>>> A patch was submitted for this a while back
>>>>>> https://sourceware.org/ml/libc-alpha/2012-01/msg00001.html and did not
>>>>>> get a good reception from the maintainer at the time. Attached is an
>>>>>> updated version for current glibc head.
>>>>>
>>>>> I believe we had consensus on use of __glibc_reserved as a prefix in such
>>>>> cases (allowing for __glibc_reserved0, __glibc_reserved1 or
>>>>> __glibc_reserved_foo, __glibc_reserved_bar in cases where more than one
>>>>> identifier, or a more meaningful name, is needed).
>>>>
>>>> OK, that makes sense, found part of that conversation in the archives.
>>>> Here is a patch (inline and attached) to convert all uses to
>>>> __glibc_reserved.
>>>>
>>>> Justin
>>>>
>>> A mechanical change that looks ok,
>>>
>>> It needs changelog so I generated following.
>>
>> Could you please repost with the patch and final ChangeLog,
>> TO me, CC libc-alpha, and I'll review.
>>
>> Cheers,
>> Carlos.
>>
> Here
OK to checkin as long as you do 2 more things please:
1. Email libc-ports and explain that you've made cross-machine
changes and renamed __unused to __glibc_reserved and to look
for any unintended breakage.
2. Update https://sourceware.org/glibc/wiki/Style_and_Conventions
and add an entry on this to explain that we use __glibc_reserved
for unused structure entries and that this is done to avoid
__unused which causes problems with BSD sources.
Thank you for following through with these changes. I've gone
through them all and looked for anything out of place and didn't
see anything. I spot checked some headers and uses matched and
they did.
I have some apprehension at changing the kernel headers because
it might complicate synching with the kernel headers, but these
headers represent a real problem in their use of `__unused` and
coordinating that not to break when building unmodified BSD
sources would be the next step. That is to say we should approach
the Linux kernel guys and explain the UAPI should not use __unused
and isntead should use __linux_unused or __uapi_unused etc. etc.
Therefore I'm fine with the changes.
> ./nptl/ChangeLog:
>
>
> * sysdeps/i386/tls.h: Use __glibc_reserved instead __unused.
Should be "Use __glibc_reserved instead of __unused."
> * sysdeps/x86_64/tls.h: Likewise.
> * sysdeps/i386/tls.h: Likewise.
> * sysdeps/x86_64/tls.h: Likewise.
>
> ./ChangeLog:
>
>
> * resolv/netdb.h: Use __glibc_reserved instead __unused..
> * rt/aio.h: Likewise.
> * sysdeps/gnu/bits/utmp.h: Likewise.
> * sysdeps/gnu/bits/utmpx.h: Likewise.
> * sysdeps/gnu/netinet/ip_icmp.h: Likewise.
> * sysdeps/unix/sysv/linux/bits/ipc.h: Likewise.
> * sysdeps/unix/sysv/linux/bits/msq.h: Likewise.
> * sysdeps/unix/sysv/linux/bits/sem.h: Likewise.
> * sysdeps/unix/sysv/linux/bits/shm.h: Likewise.
> * sysdeps/unix/sysv/linux/bits/stat.h: Likewise.
> * sysdeps/unix/sysv/linux/kernel_stat.h: Likewise.
> * sysdeps/unix/sysv/linux/ntp_gettimex.c: Likewise.
> * sysdeps/unix/sysv/linux/powerpc/bits/ipc.h: Likewise.
> * sysdeps/unix/sysv/linux/powerpc/bits/msq.h: Likewise.
> * sysdeps/unix/sysv/linux/powerpc/bits/sem.h: Likewise.
> * sysdeps/unix/sysv/linux/powerpc/bits/shm.h: Likewise.
> * sysdeps/unix/sysv/linux/powerpc/bits/stat.h: Likewise.
> * sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h: Likewise.
> * sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h: Likewise.
> * sysdeps/unix/sysv/linux/s390/bits/ipc.h: Likewise.
> * sysdeps/unix/sysv/linux/s390/bits/msq.h: Likewise.
> * sysdeps/unix/sysv/linux/s390/bits/sem.h: Likewise.
> * sysdeps/unix/sysv/linux/s390/bits/shm.h: Likewise.
> * sysdeps/unix/sysv/linux/s390/bits/stat.h: Likewise.
> * sysdeps/unix/sysv/linux/s390/bits/utmp.h: Likewise.
> * sysdeps/unix/sysv/linux/s390/bits/utmpx.h: Likewise.
> * sysdeps/unix/sysv/linux/s390/s390-32/utmp32.h: Likewise.
> * sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h: Likewise.
> * sysdeps/unix/sysv/linux/sh/bits/shm.h: Likewise.
> * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise.
> * sysdeps/unix/sysv/linux/sparc/bits/ipc.h: Likewise.
> * sysdeps/unix/sysv/linux/sparc/bits/msq.h: Likewise.
> * sysdeps/unix/sysv/linux/sparc/bits/sem.h: Likewise.
> * sysdeps/unix/sysv/linux/sparc/bits/shm.h: Likewise.
> * sysdeps/unix/sysv/linux/sparc/bits/stat.h: Likewise.
> * sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h: Likewise.
> * sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h: Likewise.
> * sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c: Likewise.
> * sysdeps/unix/sysv/linux/sparc/sys/procfs.h: Likewise.
> * sysdeps/unix/sysv/linux/sys/timex.h: Likewise.
> * sysdeps/unix/sysv/linux/x86/bits/msq.h: Likewise.
> * sysdeps/unix/sysv/linux/x86/bits/sem.h: Likewise.
> * sysdeps/unix/sysv/linux/x86/bits/shm.h: Likewise.
> * sysdeps/unix/sysv/linux/x86/bits/stat.h: Likewise.
> * sysdeps/unix/sysv/linux/xstatconv.c: Likewise.
> * sysdeps/x86/fpu/bits/fenv.h: Likewise.
>
> ./ports/ChangeLog.ia64:
>
>
> * sysdeps/unix/sysv/linux/ia64/bits/ipc.h:
> Use __glibc_reserved instead __unused.
> * sysdeps/unix/sysv/linux/ia64/bits/msq.h: Likewise.
> * sysdeps/unix/sysv/linux/ia64/bits/sem.h: Likewise.
> * sysdeps/unix/sysv/linux/ia64/bits/shm.h: Likewise.
> * sysdeps/unix/sysv/linux/ia64/bits/stat.h: Likewise.
> * sysdeps/unix/sysv/linux/ia64/bits/ipc.h: Likewise.
> * sysdeps/unix/sysv/linux/ia64/bits/msq.h: Likewise.
> * sysdeps/unix/sysv/linux/ia64/bits/sem.h: Likewise.
> * sysdeps/unix/sysv/linux/ia64/bits/shm.h: Likewise.
> * sysdeps/unix/sysv/linux/ia64/bits/stat.h: Likewise.
>
> ./ports/ChangeLog.alpha:
>
>
> * sysdeps/unix/sysv/linux/alpha/bits/ipc.h:
> Use __glibc_reserved instead __unused.
> * sysdeps/unix/sysv/linux/alpha/bits/msq.h: Likewise.
> * sysdeps/unix/sysv/linux/alpha/bits/sem.h: Likewise.
> * sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise.
> * sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise.
> * sysdeps/unix/sysv/linux/alpha/kernel_stat.h: Likewise.
> * sysdeps/unix/sysv/linux/alpha/xstatconv.c: Likewise.
> * sysdeps/unix/sysv/linux/alpha/bits/ipc.h: Likewise.
> * sysdeps/unix/sysv/linux/alpha/bits/msq.h: Likewise.
> * sysdeps/unix/sysv/linux/alpha/bits/sem.h: Likewise.
> * sysdeps/unix/sysv/linux/alpha/bits/shm.h: Likewise.
> * sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise.
> * sysdeps/unix/sysv/linux/alpha/kernel_stat.h: Likewise.
> * sysdeps/unix/sysv/linux/alpha/xstatconv.c: Likewise.
>
> ./ports/ChangeLog.unix:
>
>
> * sysdeps/unix/sysv/linux/generic/bits/msq.h:
> Use __glibc_reserved instead __unused.
> * sysdeps/unix/sysv/linux/generic/bits/sem.h: Likewise.
> * sysdeps/unix/sysv/linux/generic/bits/shm.h: Likewise.
> * sysdeps/unix/sysv/linux/generic/bits/stat.h: Likewise.
> * sysdeps/unix/sysv/linux/generic/bits/msq.h: Likewise.
> * sysdeps/unix/sysv/linux/generic/bits/sem.h: Likewise.
> * sysdeps/unix/sysv/linux/generic/bits/shm.h: Likewise.
> * sysdeps/unix/sysv/linux/generic/bits/stat.h: Likewise.
>
> ./ports/ChangeLog.mips:
>
>
> * sysdeps/unix/sysv/linux/mips/bits/ipc.h:
> Use __glibc_reserved instead __unused..
> * sysdeps/unix/sysv/linux/mips/bits/msq.h: Likewise.
> * sysdeps/unix/sysv/linux/mips/bits/sem.h: Likewise.
> * sysdeps/unix/sysv/linux/mips/bits/shm.h: Likewise.
>
> ./ports/ChangeLog.microblaze:
>
>
> * sysdeps/unix/sysv/linux/microblaze/bits/stat.h:
> Use __glibc_reserved instead __unused.
> * sysdeps/unix/sysv/linux/microblaze/kernel_stat.h: Likewise.
>
> ./ports/ChangeLog.hppa:
>
>
> * sysdeps/unix/sysv/linux/hppa/bits/ipc.h:
> Use __glibc_reserved instead __unused.
> * sysdeps/unix/sysv/linux/hppa/bits/msq.h: Likewise.
> * sysdeps/unix/sysv/linux/hppa/bits/sem.h: Likewise.
> * sysdeps/unix/sysv/linux/hppa/bits/shm.h: Likewise.
> * sysdeps/unix/sysv/linux/hppa/kernel_stat.h: Likewise.
> * sysdeps/unix/sysv/linux/hppa/bits/ipc.h: Likewise.
> * sysdeps/unix/sysv/linux/hppa/bits/msq.h: Likewise.
> * sysdeps/unix/sysv/linux/hppa/bits/sem.h: Likewise.
> * sysdeps/unix/sysv/linux/hppa/bits/shm.h: Likewise.
> * sysdeps/unix/sysv/linux/hppa/kernel_stat.h: Likewise.
>
> ./ports/ChangeLog.m68k:
>
>
> * sysdeps/unix/sysv/linux/m68k/bits/stat.h:
> Use __glibc_reserved instead __unused.
> * sysdeps/unix/sysv/linux/m68k/bits/stat.h: Likewise.
>
> ./ports/ChangeLog.arm:
>
>
> * sysdeps/unix/sysv/linux/arm/bits/shm.h:
> Use __glibc_reserved instead __unused.
> * sysdeps/unix/sysv/linux/arm/bits/shm.h: Likewise.
>
>
> diff --git a/nptl/sysdeps/i386/tls.h b/nptl/sysdeps/i386/tls.h
> index 3d18b1d..9a56e21 100644
> --- a/nptl/sysdeps/i386/tls.h
> +++ b/nptl/sysdeps/i386/tls.h
> @@ -56,7 +56,7 @@ typedef struct
> #ifndef __ASSUME_PRIVATE_FUTEX
> int private_futex;
> #else
> - int __unused1;
> + int __glibc_reserved1;
> #endif
> /* Reservation of some values for the TM ABI. */
> void *__private_tm[4];
> diff --git a/nptl/sysdeps/x86_64/tls.h b/nptl/sysdeps/x86_64/tls.h
> index 61df1af..d6350fd 100644
> --- a/nptl/sysdeps/x86_64/tls.h
> +++ b/nptl/sysdeps/x86_64/tls.h
> @@ -65,14 +65,14 @@ typedef struct
> # ifndef __ASSUME_PRIVATE_FUTEX
> int private_futex;
> # else
> - int __unused1;
> + int __glibc_reserved1;
> # endif
> int rtld_must_xmm_save;
> /* Reservation of some values for the TM ABI. */
> void *__private_tm[4];
> /* GCC split stack support. */
> void *__private_ss;
> - long int __unused2;
> + long int __glibc_reserved2;
> /* Have space for the post-AVX register size. */
> __128bits rtld_savespace_sse[8][4] __attribute__ ((aligned (32)));
>
> diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/ipc.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/ipc.h
> index 66903d3..deb3a2b 100644
> --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/ipc.h
> +++ b/ports/sysdeps/unix/sysv/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 __unused2;
> + unsigned long int __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
> diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h
> index 8bb057b..415ef21 100644
> --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h
> +++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/msq.h
> @@ -46,8 +46,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 __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
>
> #ifdef __USE_MISC
> diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/sem.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/sem.h
> index c2d73aa..739cbc4 100644
> --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/sem.h
> +++ b/ports/sysdeps/unix/sysv/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 __unused2;
> + unsigned long int __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
>
> /* The user should define a union like the following to use it for arguments
> diff --git a/ports/sysdeps/unix/sysv/linux/alpha/bits/shm.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/shm.h
> index 125e277..cd9476f 100644
> --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/shm.h
> +++ b/ports/sysdeps/unix/sysv/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 __unused2;
> + unsigned long int __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
>
> #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 __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/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h b/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h
> index 3e10647..c34cbca 100644
> --- a/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h
> +++ b/ports/sysdeps/unix/sysv/linux/alpha/bits/stat.h
> @@ -92,7 +92,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 __glibc_reserved[3];
> };
>
> #ifdef __USE_LARGEFILE64
> @@ -113,7 +113,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 __glibc_reserved[3];
> };
> #endif
>
> diff --git a/ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h b/ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
> index 94d358e..6708411 100644
> --- a/ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
> +++ b/ports/sysdeps/unix/sysv/linux/alpha/kernel_stat.h
> @@ -40,7 +40,7 @@ struct kernel_stat64
> unsigned long st_mtimensec;
> unsigned long st_ctime;
> unsigned long st_ctimensec;
> - long __unused[3];
> + long __glibc_reserved[3];
> };
>
> /* Definition of `struct stat' used by glibc 2.0. */
> @@ -82,7 +82,7 @@ struct glibc21_stat
> unsigned int st_flags;
> unsigned int st_gen;
> int __pad3;
> - long __unused[4];
> + long __glibc_reserved[4];
> };
>
> #define XSTAT_IS_XSTAT64 1
> diff --git a/ports/sysdeps/unix/sysv/linux/alpha/xstatconv.c b/ports/sysdeps/unix/sysv/linux/alpha/xstatconv.c
> index 79ec578..4e7e78b 100644
> --- a/ports/sysdeps/unix/sysv/linux/alpha/xstatconv.c
> +++ b/ports/sysdeps/unix/sysv/linux/alpha/xstatconv.c
> @@ -74,10 +74,10 @@ __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
> buf->st_flags = kbuf->st_flags;
> buf->st_gen = kbuf->st_gen;
> buf->__pad3 = 0;
> - buf->__unused[0] = 0;
> - buf->__unused[1] = 0;
> - buf->__unused[2] = 0;
> - buf->__unused[3] = 0;
> + buf->__glibc_reserved[0] = 0;
> + buf->__glibc_reserved[1] = 0;
> + buf->__glibc_reserved[2] = 0;
> + buf->__glibc_reserved[3] = 0;
> }
> break;
>
> @@ -105,9 +105,9 @@ __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
> buf->st_ctime = kbuf->st_ctime;
> buf->st_ctimensec = 0;
>
> - buf->__unused[0] = 0;
> - buf->__unused[1] = 0;
> - buf->__unused[2] = 0;
> + buf->__glibc_reserved[0] = 0;
> + buf->__glibc_reserved[1] = 0;
> + buf->__glibc_reserved[2] = 0;
> }
> break;
>
> diff --git a/ports/sysdeps/unix/sysv/linux/arm/bits/shm.h b/ports/sysdeps/unix/sysv/linux/arm/bits/shm.h
> index 08a0ca4..eb581ea 100644
> --- a/ports/sysdeps/unix/sysv/linux/arm/bits/shm.h
> +++ b/ports/sysdeps/unix/sysv/linux/arm/bits/shm.h
> @@ -51,16 +51,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 __glibc_reserved1;
> __time_t shm_dtime; /* time of last shmdt() */
> - unsigned long int __unused2;
> + unsigned long int __glibc_reserved2;
> __time_t shm_ctime; /* time of last change by shmctl() */
> - unsigned long int __unused3;
> + unsigned long int __glibc_reserved3;
> __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
> @@ -82,10 +82,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/ports/sysdeps/unix/sysv/linux/generic/bits/msq.h b/ports/sysdeps/unix/sysv/linux/generic/bits/msq.h
> index 49cbf06..c2680d0 100644
> --- a/ports/sysdeps/unix/sysv/linux/generic/bits/msq.h
> +++ b/ports/sysdeps/unix/sysv/linux/generic/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 == 32
> - unsigned long int __unused1;
> + unsigned long int __glibc_reserved1;
> #endif
> __time_t msg_rtime; /* time of last msgrcv command */
> #if __WORDSIZE == 32
> - unsigned long int __unused2;
> + unsigned long int __glibc_reserved2;
> #endif
> __time_t msg_ctime; /* time of last change */
> #if __WORDSIZE == 32
> - 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/ports/sysdeps/unix/sysv/linux/generic/bits/sem.h b/ports/sysdeps/unix/sysv/linux/generic/bits/sem.h
> index 8b926ce..7b5d36a 100644
> --- a/ports/sysdeps/unix/sysv/linux/generic/bits/sem.h
> +++ b/ports/sysdeps/unix/sysv/linux/generic/bits/sem.h
> @@ -42,15 +42,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 __glibc_reserved1;
> #endif
> __time_t sem_ctime; /* last time changed by semctl() */
> #if __WORDSIZE == 32
> - 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/ports/sysdeps/unix/sysv/linux/generic/bits/shm.h b/ports/sysdeps/unix/sysv/linux/generic/bits/shm.h
> index 070058f..5afd30f 100644
> --- a/ports/sysdeps/unix/sysv/linux/generic/bits/shm.h
> +++ b/ports/sysdeps/unix/sysv/linux/generic/bits/shm.h
> @@ -54,21 +54,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 __glibc_reserved1;
> #endif
> __time_t shm_dtime; /* time of last shmdt() */
> #if __WORDSIZE == 32
> - unsigned long int __unused2;
> + unsigned long int __glibc_reserved2;
> #endif
> __time_t shm_ctime; /* time of last change by shmctl() */
> #if __WORDSIZE == 32
> - 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
> @@ -90,10 +90,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/ports/sysdeps/unix/sysv/linux/generic/bits/stat.h b/ports/sysdeps/unix/sysv/linux/generic/bits/stat.h
> index 6e74cec..b308c65 100644
> --- a/ports/sysdeps/unix/sysv/linux/generic/bits/stat.h
> +++ b/ports/sysdeps/unix/sysv/linux/generic/bits/stat.h
> @@ -87,7 +87,7 @@ struct stat
> __time_t st_ctime; /* Time of last status change. */
> unsigned long int st_ctimensec; /* Nsecs of last status change. */
> #endif
> - int __unused[2];
> + int __glibc_reserved[2];
> };
>
> #undef __field64
> @@ -125,7 +125,7 @@ struct stat64
> __time_t st_ctime; /* Time of last status change. */
> unsigned long int st_ctimensec; /* Nsecs of last status change. */
> #endif
> - int __unused[2];
> + int __glibc_reserved[2];
> };
> #endif
>
> diff --git a/ports/sysdeps/unix/sysv/linux/hppa/bits/ipc.h b/ports/sysdeps/unix/sysv/linux/hppa/bits/ipc.h
> index 04a75e2..34827a9 100644
> --- a/ports/sysdeps/unix/sysv/linux/hppa/bits/ipc.h
> +++ b/ports/sysdeps/unix/sysv/linux/hppa/bits/ipc.h
> @@ -57,6 +57,6 @@ struct ipc_perm
> #endif
> unsigned short int __seq; /* Sequence number. */
> unsigned int __pad3;
> - __extension__ unsigned long long int __unused1;
> - __extension__ unsigned long long int __unused2;
> + __extension__ unsigned long long int __glibc_reserved1;
> + __extension__ unsigned long long int __glibc_reserved2;
> };
> diff --git a/ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h b/ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h
> index ac35f51..366165e 100644
> --- a/ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h
> +++ b/ports/sysdeps/unix/sysv/linux/hppa/bits/msq.h
> @@ -56,8 +56,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 __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
>
> #ifdef __USE_MISC
> diff --git a/ports/sysdeps/unix/sysv/linux/hppa/bits/sem.h b/ports/sysdeps/unix/sysv/linux/hppa/bits/sem.h
> index 9c18016..9f47117 100644
> --- a/ports/sysdeps/unix/sysv/linux/hppa/bits/sem.h
> +++ b/ports/sysdeps/unix/sysv/linux/hppa/bits/sem.h
> @@ -48,8 +48,8 @@ struct semid_ds
> #endif
> __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 __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
>
> /* The user should define a union like the following to use it for arguments
> diff --git a/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h b/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h
> index 9ebf2ec..6905df0 100644
> --- a/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h
> +++ b/ports/sysdeps/unix/sysv/linux/hppa/bits/shm.h
> @@ -64,8 +64,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 __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
>
> #ifdef __USE_MISC
> @@ -87,10 +87,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 __glibc_reserved1;
> + unsigned long __glibc_reserved2;
> + unsigned long __glibc_reserved3;
> + unsigned long __glibc_reserved4;
> };
>
> struct shm_info
> diff --git a/ports/sysdeps/unix/sysv/linux/hppa/kernel_stat.h b/ports/sysdeps/unix/sysv/linux/hppa/kernel_stat.h
> index a85c5be..e3ea724 100644
> --- a/ports/sysdeps/unix/sysv/linux/hppa/kernel_stat.h
> +++ b/ports/sysdeps/unix/sysv/linux/hppa/kernel_stat.h
> @@ -13,11 +13,11 @@ struct kernel_stat {
> struct timespec st_ctim;
> long st_blksize;
> long st_blocks;
> - unsigned long __unused1; /* ACL stuff */
> - unsigned long __unused2; /* network */
> - unsigned long __unused3; /* network */
> - unsigned long __unused4; /* cnodes */
> - unsigned short __unused5; /* netsite */
> + unsigned long __glibc_reserved1; /* ACL stuff */
> + unsigned long __glibc_reserved2; /* network */
> + unsigned long __glibc_reserved3; /* network */
> + unsigned long __glibc_reserved4; /* cnodes */
> + unsigned short __glibc_reserved5; /* netsite */
> short st_fstype;
> unsigned long st_realdev;
> unsigned short st_basemode;
> diff --git a/ports/sysdeps/unix/sysv/linux/ia64/bits/ipc.h b/ports/sysdeps/unix/sysv/linux/ia64/bits/ipc.h
> index 1063828..fb78b5b 100644
> --- a/ports/sysdeps/unix/sysv/linux/ia64/bits/ipc.h
> +++ b/ports/sysdeps/unix/sysv/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 __unused2;
> + unsigned long int __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
> diff --git a/ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h b/ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h
> index 8519390..f3f9f75 100644
> --- a/ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h
> +++ b/ports/sysdeps/unix/sysv/linux/ia64/bits/msq.h
> @@ -42,8 +42,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 __unused2;
> + unsigned long int __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
>
> #ifdef __USE_MISC
> diff --git a/ports/sysdeps/unix/sysv/linux/ia64/bits/sem.h b/ports/sysdeps/unix/sysv/linux/ia64/bits/sem.h
> index 392493b..998ba85 100644
> --- a/ports/sysdeps/unix/sysv/linux/ia64/bits/sem.h
> +++ b/ports/sysdeps/unix/sysv/linux/ia64/bits/sem.h
> @@ -42,8 +42,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 __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
>
> /* The user should define a union like the following to use it for arguments
> diff --git a/ports/sysdeps/unix/sysv/linux/ia64/bits/shm.h b/ports/sysdeps/unix/sysv/linux/ia64/bits/shm.h
> index 05755f8..a6c0910 100644
> --- a/ports/sysdeps/unix/sysv/linux/ia64/bits/shm.h
> +++ b/ports/sysdeps/unix/sysv/linux/ia64/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 __unused2;
> + unsigned long int __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
>
> #ifdef __USE_MISC
> @@ -75,10 +75,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/ports/sysdeps/unix/sysv/linux/ia64/bits/stat.h b/ports/sysdeps/unix/sysv/linux/ia64/bits/stat.h
> index b2071cd..d984dc4 100644
> --- a/ports/sysdeps/unix/sysv/linux/ia64/bits/stat.h
> +++ b/ports/sysdeps/unix/sysv/linux/ia64/bits/stat.h
> @@ -64,7 +64,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];
> };
>
> #ifdef __USE_LARGEFILE64
> @@ -103,7 +103,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];
> };
> #endif
>
> diff --git a/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h b/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
> index fb65b14..da6e456 100644
> --- a/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
> +++ b/ports/sysdeps/unix/sysv/linux/m68k/bits/stat.h
> @@ -84,8 +84,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
> diff --git a/ports/sysdeps/unix/sysv/linux/microblaze/bits/stat.h b/ports/sysdeps/unix/sysv/linux/microblaze/bits/stat.h
> index 0fa0edb..e41d992 100644
> --- a/ports/sysdeps/unix/sysv/linux/microblaze/bits/stat.h
> +++ b/ports/sysdeps/unix/sysv/linux/microblaze/bits/stat.h
> @@ -71,8 +71,8 @@ struct stat
> __time_t st_ctime; /* Time of last status change. */
> unsigned long int st_ctimensec; /* Nsecs of last status change. */
> #endif
> - unsigned int __unused4;
> - unsigned int __unused5;
> + unsigned int __glibc_reserved4;
> + unsigned int __glibc_reserved5;
> };
> #else /* __USE_FILE_OFFSET64 */
> /* MS: If __USE_FILE_OFFSET64 is setup then struct stat should match stat64
> @@ -115,8 +115,8 @@ struct stat
> __time_t st_ctime; /* Time of last status change. */
> unsigned long int st_ctimensec; /* Nsecs of last status change. */
> #endif
> - unsigned int __unused4;
> - unsigned int __unused5;
> + unsigned int __glibc_reserved4;
> + unsigned int __glibc_reserved5;
> };
> #endif /* __USE_FILE_OFFSET64 */
>
> @@ -156,8 +156,8 @@ struct stat64
> __time_t st_ctime; /* Time of last status change. */
> unsigned long int st_ctimensec; /* Nsecs of last status change. */
> #endif
> - unsigned int __unused4;
> - unsigned int __unused5;
> + unsigned int __glibc_reserved4;
> + unsigned int __glibc_reserved5;
> };
> #endif
>
> diff --git a/ports/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h b/ports/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h
> index 2823856..12d718e 100644
> --- a/ports/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h
> +++ b/ports/sysdeps/unix/sysv/linux/microblaze/kernel_stat.h
> @@ -40,10 +40,10 @@ struct kernel_stat
> struct timespec st_ctim;
> #define _HAVE_STAT_NSEC
> #define _HAVE_STAT64_NSEC
> - unsigned int __unused4;
> + unsigned int __glibc_reserved4;
> #define _HAVE_STAT___UNUSED4
> #define _HAVE_STAT64___UNUSED4
> - unsigned int __unused5;
> + unsigned int __glibc_reserved5;
> #define _HAVE_STAT___UNUSED5
> #define _HAVE_STAT64___UNUSED5
> };
> diff --git a/ports/sysdeps/unix/sysv/linux/mips/bits/ipc.h b/ports/sysdeps/unix/sysv/linux/mips/bits/ipc.h
> index 8b2892d..82496d6 100644
> --- a/ports/sysdeps/unix/sysv/linux/mips/bits/ipc.h
> +++ b/ports/sysdeps/unix/sysv/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 __unused2;
> + unsigned long int __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
> diff --git a/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h b/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h
> index e814bc7..f97585c 100644
> --- a/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h
> +++ b/ports/sysdeps/unix/sysv/linux/mips/bits/msq.h
> @@ -39,33 +39,33 @@ struct msqid_ds
> {
> struct ipc_perm msg_perm; /* structure describing operation permission */
> #if __WORDSIZE == 32 && defined (__MIPSEB__)
> - unsigned long int __unused1;
> + unsigned long int __glibc_reserved1;
> #endif
> __time_t msg_stime; /* time of last msgsnd command */
> #if __WORDSIZE == 32 && defined (__MIPSEL__)
> - unsigned long int __unused1;
> + unsigned long int __glibc_reserved1;
> #endif
> #if __WORDSIZE == 32 && defined (__MIPSEB__)
> - unsigned long int __unused2;
> + unsigned long int __glibc_reserved2;
> #endif
> __time_t msg_rtime; /* time of last msgrcv command */
> #if __WORDSIZE == 32 && defined (__MIPSEL__)
> - unsigned long int __unused2;
> + unsigned long int __glibc_reserved2;
> #endif
> #if __WORDSIZE == 32 && defined (__MIPSEB__)
> - unsigned long int __unused3;
> + unsigned long int __glibc_reserved3;
> #endif
> __time_t msg_ctime; /* time of last change */
> #if __WORDSIZE == 32 && defined (__MIPSEL__)
> - 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/ports/sysdeps/unix/sysv/linux/mips/bits/sem.h b/ports/sysdeps/unix/sysv/linux/mips/bits/sem.h
> index c2d73aa..739cbc4 100644
> --- a/ports/sysdeps/unix/sysv/linux/mips/bits/sem.h
> +++ b/ports/sysdeps/unix/sysv/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 __unused2;
> + unsigned long int __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
>
> /* The user should define a union like the following to use it for arguments
> diff --git a/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h b/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h
> index 5c11803..28d8ab0 100644
> --- a/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h
> +++ b/ports/sysdeps/unix/sysv/linux/mips/bits/shm.h
> @@ -53,8 +53,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 __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
>
> #ifdef __USE_MISC
> @@ -75,10 +75,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/resolv/netdb.h b/resolv/netdb.h
> index 412343b..56729d1 100644
> --- a/resolv/netdb.h
> +++ b/resolv/netdb.h
> @@ -586,7 +586,7 @@ struct gaicb
> struct addrinfo *ar_result; /* Pointer to result. */
> /* The following are internal elements. */
> int __return;
> - int __unused[5];
> + int __glibc_reserved[5];
> };
>
> /* Lookup mode. */
> diff --git a/rt/aio.h b/rt/aio.h
> index 23d602d..fd2f15d 100644
> --- a/rt/aio.h
> +++ b/rt/aio.h
> @@ -54,7 +54,7 @@ struct aiocb
> #else
> __off64_t aio_offset; /* File offset. */
> #endif
> - char __unused[32];
> + char __glibc_reserved[32];
> };
>
> /* The same for the 64bit offsets. Please note that the members aio_fildes
> @@ -77,7 +77,7 @@ struct aiocb64
> __ssize_t __return_value;
>
> __off64_t aio_offset; /* File offset. */
> - char __unused[32];
> + char __glibc_reserved[32];
> };
> #endif
>
> diff --git a/sysdeps/gnu/bits/utmp.h b/sysdeps/gnu/bits/utmp.h
> index 8a768d9..ebb611c 100644
> --- a/sysdeps/gnu/bits/utmp.h
> +++ b/sysdeps/gnu/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/gnu/bits/utmpx.h b/sysdeps/gnu/bits/utmpx.h
> index 6cfb316..271d8b7 100644
> --- a/sysdeps/gnu/bits/utmpx.h
> +++ b/sysdeps/gnu/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. */
> };
>
>
> diff --git a/sysdeps/gnu/netinet/ip_icmp.h b/sysdeps/gnu/netinet/ip_icmp.h
> index 136fb47..d23318c 100644
> --- a/sysdeps/gnu/netinet/ip_icmp.h
> +++ b/sysdeps/gnu/netinet/ip_icmp.h
> @@ -38,7 +38,7 @@ struct icmphdr
> u_int32_t gateway; /* gateway address */
> struct
> {
> - u_int16_t __unused;
> + u_int16_t __glibc_reserved;
> u_int16_t mtu;
> } frag; /* path mtu discovery */
> } un;
> diff --git a/sysdeps/unix/sysv/linux/bits/ipc.h b/sysdeps/unix/sysv/linux/bits/ipc.h
> index a29cb6d..9460643 100644
> --- a/sysdeps/unix/sysv/linux/bits/ipc.h
> +++ b/sysdeps/unix/sysv/linux/bits/ipc.h
> @@ -50,6 +50,6 @@ struct ipc_perm
> unsigned short int __pad1;
> unsigned short int __seq; /* Sequence number. */
> unsigned short int __pad2;
> - __syscall_ulong_t __unused1;
> - __syscall_ulong_t __unused2;
> + __syscall_ulong_t __glibc_reserved1;
> + __syscall_ulong_t __glibc_reserved2;
> };
> diff --git a/sysdeps/unix/sysv/linux/bits/msq.h b/sysdeps/unix/sysv/linux/bits/msq.h
> index 8f6eb8a..59fc2fd 100644
> --- a/sysdeps/unix/sysv/linux/bits/msq.h
> +++ b/sysdeps/unix/sysv/linux/bits/msq.h
> @@ -39,18 +39,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 __glibc_reserved1;
> __time_t msg_rtime; /* time of last msgrcv command */
> - unsigned long int __unused2;
> + unsigned long int __glibc_reserved2;
> __time_t msg_ctime; /* time of last change */
> - unsigned long int __unused3;
> + unsigned long int __glibc_reserved3;
> 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/bits/sem.h b/sysdeps/unix/sysv/linux/bits/sem.h
> index 62f5407..26ea325 100644
> --- a/sysdeps/unix/sysv/linux/bits/sem.h
> +++ b/sysdeps/unix/sysv/linux/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 __glibc_reserved1;
> __time_t sem_ctime; /* last time changed by semctl() */
> - unsigned long int __unused2;
> + unsigned long int __glibc_reserved2;
> 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/bits/shm.h b/sysdeps/unix/sysv/linux/bits/shm.h
> index e0ad934..5390d66 100644
> --- a/sysdeps/unix/sysv/linux/bits/shm.h
> +++ b/sysdeps/unix/sysv/linux/bits/shm.h
> @@ -51,16 +51,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 __glibc_reserved1;
> __time_t shm_dtime; /* time of last shmdt() */
> - unsigned long int __unused2;
> + unsigned long int __glibc_reserved2;
> __time_t shm_ctime; /* time of last change by shmctl() */
> - unsigned long int __unused3;
> + unsigned long int __glibc_reserved3;
> __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
> @@ -82,10 +82,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/bits/stat.h b/sysdeps/unix/sysv/linux/bits/stat.h
> index d71093e..65e2a5a 100644
> --- a/sysdeps/unix/sysv/linux/bits/stat.h
> +++ b/sysdeps/unix/sysv/linux/bits/stat.h
> @@ -84,8 +84,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
> diff --git a/sysdeps/unix/sysv/linux/kernel_stat.h b/sysdeps/unix/sysv/linux/kernel_stat.h
> index 9f8434c..dcdab48 100644
> --- a/sysdeps/unix/sysv/linux/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/kernel_stat.h
> @@ -18,9 +18,9 @@ struct kernel_stat
> struct timespec st_atim;
> struct timespec st_mtim;
> struct timespec st_ctim;
> - unsigned long int __unused4;
> + unsigned long int __glibc_reserved4;
> #define _HAVE___UNUSED4
> - unsigned long int __unused5;
> + unsigned long int __glibc_reserved5;
> #define _HAVE___UNUSED5
> };
>
> diff --git a/sysdeps/unix/sysv/linux/ntp_gettimex.c b/sysdeps/unix/sysv/linux/ntp_gettimex.c
> index 24dae73..4f35227 100644
> --- a/sysdeps/unix/sysv/linux/ntp_gettimex.c
> +++ b/sysdeps/unix/sysv/linux/ntp_gettimex.c
> @@ -37,9 +37,9 @@ ntp_gettimex (struct ntptimeval *ntv)
> ntv->maxerror = tntx.maxerror;
> ntv->esterror = tntx.esterror;
> ntv->tai = tntx.tai;
> - ntv->__unused1 = 0;
> - ntv->__unused2 = 0;
> - ntv->__unused3 = 0;
> - ntv->__unused4 = 0;
> + ntv->__glibc_reserved1 = 0;
> + ntv->__glibc_reserved2 = 0;
> + ntv->__glibc_reserved3 = 0;
> + ntv->__glibc_reserved4 = 0;
> return result;
> }
> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h b/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
> index f2bb635..889bbcd 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/bits/ipc.h
> @@ -49,8 +49,8 @@ struct ipc_perm
> __mode_t mode; /* Read/write permission. */
> __uint32_t __seq; /* Sequence number. */
> __uint32_t __pad1;
> - __uint64_t __unused1;
> - __uint64_t __unused2;
> + __uint64_t __glibc_reserved1;
> + __uint64_t __glibc_reserved2;
> };
>
>
> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/msq.h b/sysdeps/unix/sysv/linux/powerpc/bits/msq.h
> index 59147c2..b22fa72 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/bits/msq.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/bits/msq.h
> @@ -39,15 +39,15 @@ struct msqid_ds
> {
> struct ipc_perm msg_perm; /* structure describing operation permission */
> #if __WORDSIZE == 32
> - unsigned int __unused1;
> + unsigned int __glibc_reserved1;
> #endif
> __time_t msg_stime; /* time of last msgsnd command */
> #if __WORDSIZE == 32
> - unsigned int __unused2;
> + unsigned int __glibc_reserved2;
> #endif
> __time_t msg_rtime; /* time of last msgrcv command */
> #if __WORDSIZE == 32
> - unsigned int __unused3;
> + unsigned int __glibc_reserved3;
> #endif
> __time_t msg_ctime; /* time of last change */
> unsigned long __msg_cbytes; /* current number of bytes on queue */
> @@ -55,8 +55,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 __unused5;
> + unsigned long __glibc_reserved4;
> + unsigned long __glibc_reserved5;
> };
>
> #ifdef __USE_MISC
> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/sem.h b/sysdeps/unix/sysv/linux/powerpc/bits/sem.h
> index 3847a33..56f47f1 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/bits/sem.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/bits/sem.h
> @@ -39,16 +39,16 @@ struct semid_ds
> {
> struct ipc_perm sem_perm; /* operation permission struct */
> #if __WORDSIZE == 32
> - unsigned int __unused1;
> + unsigned int __glibc_reserved1;
> #endif
> __time_t sem_otime; /* last semop() time */
> #if __WORDSIZE == 32
> - unsigned int __unused2;
> + unsigned int __glibc_reserved2;
> #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 __unused4;
> + unsigned long __glibc_reserved3;
> + unsigned long __glibc_reserved4;
> };
>
> /* The user should define a union like the following to use it for arguments
> diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/shm.h b/sysdeps/unix/sysv/linux/powerpc/bits/shm.h
> index e43d2fd..a343335 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/bits/shm.h
> +++ b/sysdeps/unix/sysv/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 __glibc_reserved1;
> #endif
> __time_t shm_atime; /* time of last shmat() */
> #if __WORDSIZE == 32
> - unsigned int __unused2;
> + unsigned int __glibc_reserved2;
> #endif
> __time_t shm_dtime; /* time of last shmdt() */
> #if __WORDSIZE == 32
> - unsigned int __unused3;
> + unsigned int __glibc_reserved3;
> #endif
> __time_t shm_ctime; /* time of last change by shmctl() */
> #if __WORDSIZE == 32
> - unsigned int __unused4;
> + unsigned int __glibc_reserved4;
> #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 __unused6;
> + unsigned long __glibc_reserved5;
> + unsigned long __glibc_reserved6;
> };
>
> #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 __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/powerpc/bits/stat.h b/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
> index e5faec0..252aae9 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/bits/stat.h
> @@ -91,8 +91,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 __glibc_reserved4;
> + unsigned long int __glibc_reserved5;
> };
>
>
> @@ -131,8 +131,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 __glibc_reserved4;
> + unsigned long int __glibc_reserved5;
> };
> # endif /* __USE_LARGEFILE64 */
>
> @@ -185,9 +185,9 @@ 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 __unused6;
> + unsigned long int __glibc_reserved4;
> + unsigned long int __glibc_reserved5;
> + unsigned long int __glibc_reserved6;
> };
>
> # ifdef __USE_LARGEFILE64
> @@ -225,9 +225,9 @@ 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 __unused6;
> + unsigned long int __glibc_reserved4;
> + unsigned long int __glibc_reserved5;
> + unsigned long int __glibc_reserved6;
> };
> # endif /* __USE_LARGEFILE64 */
> #endif
> diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h b/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h
> index 93cfb76..b816da9 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/kernel_stat.h
> @@ -31,9 +31,9 @@ struct kernel_stat
> struct timespec st_atim;
> struct timespec st_mtim;
> struct timespec st_ctim;
> - unsigned long int __unused4;
> + unsigned long int __glibc_reserved4;
> #define _HAVE___UNUSED4
> - unsigned long int __unused5;
> + unsigned long int __glibc_reserved5;
> #define _HAVE___UNUSED5
> };
>
> diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h b/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
> index 935a68c..11f48b5 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h
> @@ -97,7 +97,7 @@ typedef struct _libc_vrstate
> } vrregset_t __attribute__((__aligned__(16)));
>
> typedef struct {
> - unsigned long __unused[4];
> + unsigned long __glibc_reserved[4];
> int signal;
> int __pad0;
> unsigned long handler;
> diff --git a/sysdeps/unix/sysv/linux/s390/bits/ipc.h b/sysdeps/unix/sysv/linux/s390/bits/ipc.h
> index 39519a4..1493af7 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 a5eaf89..e2a7e03 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 fe94448..7bfc477 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 c678219..358e617 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 5d1e222..51be598 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 a46470f..96c1c99 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 1fba0b6..cb6067b 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. */
> };
>
>
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.h b/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.h
> index 350b3e6..ae7f04d 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.h
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/utmp32.h
> @@ -44,7 +44,7 @@ struct utmp32
> } ut_tv; /* Time entry was made. */
>
> 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. */
> };
>
>
> diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h
> index 82fc774..9e4f33d 100644
> --- a/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h
> +++ b/sysdeps/unix/sysv/linux/s390/s390-32/utmpx32.h
> @@ -44,7 +44,7 @@ struct utmpx32
> } ut_tv; /* Time entry was made. */
>
> __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. */
> };
>
> /* The internal interface needed by the compat wrapper functions. */
> diff --git a/sysdeps/unix/sysv/linux/sh/bits/shm.h b/sysdeps/unix/sysv/linux/sh/bits/shm.h
> index d67172b..d351609 100644
> --- a/sysdeps/unix/sysv/linux/sh/bits/shm.h
> +++ b/sysdeps/unix/sysv/linux/sh/bits/shm.h
> @@ -49,16 +49,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 __glibc_reserved1;
> __time_t shm_dtime; /* time of last shmdt() */
> - unsigned long int __unused2;
> + unsigned long int __glibc_reserved2;
> __time_t shm_ctime; /* time of last change by shmctl() */
> - unsigned long int __unused3;
> + unsigned long int __glibc_reserved3;
> __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
> @@ -80,10 +80,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/sparc/bits/fcntl.h b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
> index f384bc7..7efdf68 100644
> --- a/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
> +++ b/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
> @@ -82,7 +82,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 __glibc_reserved;
> };
>
> #ifdef __USE_LARGEFILE64
> @@ -93,7 +93,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 __glibc_reserved;
> };
> #endif
>
> diff --git a/sysdeps/unix/sysv/linux/sparc/bits/ipc.h b/sysdeps/unix/sysv/linux/sparc/bits/ipc.h
> index e59f96a..885c1f7 100644
> --- a/sysdeps/unix/sysv/linux/sparc/bits/ipc.h
> +++ b/sysdeps/unix/sysv/linux/sparc/bits/ipc.h
> @@ -56,6 +56,6 @@ struct ipc_perm
> unsigned short int __pad1;
> #endif
> unsigned short int __seq; /* Sequence number. */
> - __extension__ unsigned long long int __unused1;
> - __extension__ unsigned long long int __unused2;
> + __extension__ unsigned long long int __glibc_reserved1;
> + __extension__ unsigned long long int __glibc_reserved2;
> };
> diff --git a/sysdeps/unix/sysv/linux/sparc/bits/msq.h b/sysdeps/unix/sysv/linux/sparc/bits/msq.h
> index 0a01927..cdeda0f 100644
> --- a/sysdeps/unix/sysv/linux/sparc/bits/msq.h
> +++ b/sysdeps/unix/sysv/linux/sparc/bits/msq.h
> @@ -56,8 +56,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 __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
>
> #ifdef __USE_MISC
> diff --git a/sysdeps/unix/sysv/linux/sparc/bits/sem.h b/sysdeps/unix/sysv/linux/sparc/bits/sem.h
> index ca02733..558e5aa 100644
> --- a/sysdeps/unix/sysv/linux/sparc/bits/sem.h
> +++ b/sysdeps/unix/sysv/linux/sparc/bits/sem.h
> @@ -48,8 +48,8 @@ struct semid_ds
> #endif
> __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 __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
>
> /* The user should define a union like the following to use it for arguments
> diff --git a/sysdeps/unix/sysv/linux/sparc/bits/shm.h b/sysdeps/unix/sysv/linux/sparc/bits/shm.h
> index 4cbfc72..4518cf0 100644
> --- a/sysdeps/unix/sysv/linux/sparc/bits/shm.h
> +++ b/sysdeps/unix/sysv/linux/sparc/bits/shm.h
> @@ -66,8 +66,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 __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
>
> #ifdef __USE_MISC
> @@ -89,10 +89,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 __glibc_reserved1;
> + unsigned long __glibc_reserved2;
> + unsigned long __glibc_reserved3;
> + unsigned long __glibc_reserved4;
> };
>
> struct shm_info
> diff --git a/sysdeps/unix/sysv/linux/sparc/bits/stat.h b/sysdeps/unix/sysv/linux/sparc/bits/stat.h
> index 9f6812e..b87fd58 100644
> --- a/sysdeps/unix/sysv/linux/sparc/bits/stat.h
> +++ b/sysdeps/unix/sysv/linux/sparc/bits/stat.h
> @@ -83,8 +83,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 __glibc_reserved4;
> + unsigned long int __glibc_reserved5;
> };
>
> #ifdef __USE_LARGEFILE64
> @@ -126,8 +126,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 __glibc_reserved4;
> + unsigned long int __glibc_reserved5;
> };
> #endif
>
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h b/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h
> index a0da019..5b894b8 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/kernel_stat.h
> @@ -14,8 +14,8 @@ struct kernel_stat
> struct timespec st_ctim;
> long int st_blksize;
> long int st_blocks;
> - unsigned long int __unused4;
> - unsigned long int __unused5;
> + unsigned long int __glibc_reserved4;
> + unsigned long int __glibc_reserved5;
> };
>
> #define _HAVE___UNUSED4
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h b/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
> index a4e411d..2a26a78 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h
> @@ -14,8 +14,8 @@ struct kernel_stat
> long int st_ctime_sec;
> long int st_blksize;
> long int st_blocks;
> - unsigned long int __unused1;
> - unsigned long int __unused2;
> + unsigned long int __glibc_reserved1;
> + unsigned long int __glibc_reserved2;
> };
>
> /* Definition of `struct stat64' used in the kernel. */
> @@ -41,7 +41,7 @@ struct kernel_stat64
> unsigned long int st_mtime_nsec;
> unsigned long int st_ctime_sec;
> unsigned long int st_ctime_nsec;
> - long int __unused[3];
> + long int __glibc_reserved[3];
> };
>
> #define XSTAT_IS_XSTAT64 1
> diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c b/sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c
> index b7e4d96..f41d825 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c
> +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/xstatconv.c
> @@ -58,8 +58,8 @@ __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
> buf->st_mtim.tv_nsec = 0;
> buf->st_ctim.tv_sec = kbuf->st_ctime_sec;
> buf->st_ctim.tv_nsec = 0;
> - buf->__unused4 = 0;
> - buf->__unused5 = 0;
> + buf->__glibc_reserved4 = 0;
> + buf->__glibc_reserved5 = 0;
> }
> break;
>
> @@ -108,8 +108,8 @@ __xstat32_conv (int vers, struct stat64 *sbuf, struct stat *buf)
> buf->st_mtim.tv_nsec = kbuf->st_mtime_nsec;
> buf->st_ctim.tv_sec = kbuf->st_ctime_sec;
> buf->st_ctim.tv_nsec = kbuf->st_ctime_nsec;
> - buf->__unused4 = 0;
> - buf->__unused5 = 0;
> + buf->__glibc_reserved4 = 0;
> + buf->__glibc_reserved5 = 0;
> }
> break;
>
> diff --git a/sysdeps/unix/sysv/linux/sparc/sys/procfs.h b/sysdeps/unix/sysv/linux/sparc/sys/procfs.h
> index 4d8c450..db7ef22 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sys/procfs.h
> +++ b/sysdeps/unix/sysv/linux/sparc/sys/procfs.h
> @@ -55,7 +55,7 @@ typedef struct
> unsigned long pr_regs[32];
> double pr_dregs[16];
> } pr_fr;
> - unsigned long __unused;
> + unsigned long __glibc_reserved;
> unsigned long pr_fsr;
> unsigned char pr_qcnt;
> unsigned char pr_q_entrysize;
> @@ -150,7 +150,7 @@ typedef struct
> unsigned int pr_regs[32];
> double pr_dregs[16];
> } pr_fr;
> - unsigned int __unused;
> + unsigned int __glibc_reserved;
> unsigned int pr_fsr;
> unsigned char pr_qcnt;
> unsigned char pr_q_entrysize;
> diff --git a/sysdeps/unix/sysv/linux/sys/timex.h b/sysdeps/unix/sysv/linux/sys/timex.h
> index 610ad63..9fea624 100644
> --- a/sysdeps/unix/sysv/linux/sys/timex.h
> +++ b/sysdeps/unix/sysv/linux/sys/timex.h
> @@ -34,10 +34,10 @@ struct ntptimeval
> long int esterror; /* estimated error (us) (ro) */
> long int tai; /* TAI offset (ro) */
>
> - long int __unused1;
> - long int __unused2;
> - long int __unused3;
> - long int __unused4;
> + long int __glibc_reserved1;
> + long int __glibc_reserved2;
> + long int __glibc_reserved3;
> + long int __glibc_reserved4;
> };
>
> /* Clock states (time_state) */
> diff --git a/sysdeps/unix/sysv/linux/x86/bits/msq.h b/sysdeps/unix/sysv/linux/x86/bits/msq.h
> index 9355e46..f078bbe 100644
> --- a/sysdeps/unix/sysv/linux/x86/bits/msq.h
> +++ b/sysdeps/unix/sysv/linux/x86/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 */
> #ifndef __x86_64__
> - unsigned long int __unused1;
> + unsigned long int __glibc_reserved1;
> #endif
> __time_t msg_rtime; /* time of last msgrcv command */
> #ifndef __x86_64__
> - unsigned long int __unused2;
> + unsigned long int __glibc_reserved2;
> #endif
> __time_t msg_ctime; /* time of last change */
> #ifndef __x86_64__
> - unsigned long int __unused3;
> + unsigned long int __glibc_reserved3;
> #endif
> __syscall_ulong_t __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() */
> - __syscall_ulong_t __unused4;
> - __syscall_ulong_t __unused5;
> + __syscall_ulong_t __glibc_reserved4;
> + __syscall_ulong_t __glibc_reserved5;
> };
>
> #ifdef __USE_MISC
> diff --git a/sysdeps/unix/sysv/linux/x86/bits/sem.h b/sysdeps/unix/sysv/linux/x86/bits/sem.h
> index b2eaaa9..2ec6bb5 100644
> --- a/sysdeps/unix/sysv/linux/x86/bits/sem.h
> +++ b/sysdeps/unix/sysv/linux/x86/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 */
> - __syscall_ulong_t __unused1;
> + __syscall_ulong_t __glibc_reserved1;
> __time_t sem_ctime; /* last time changed by semctl() */
> - __syscall_ulong_t __unused2;
> + __syscall_ulong_t __glibc_reserved2;
> __syscall_ulong_t sem_nsems; /* number of semaphores in set */
> - __syscall_ulong_t __unused3;
> - __syscall_ulong_t __unused4;
> + __syscall_ulong_t __glibc_reserved3;
> + __syscall_ulong_t __glibc_reserved4;
> };
>
> /* The user should define a union like the following to use it for arguments
> diff --git a/sysdeps/unix/sysv/linux/x86/bits/shm.h b/sysdeps/unix/sysv/linux/x86/bits/shm.h
> index 4fdd062..13b11bf 100644
> --- a/sysdeps/unix/sysv/linux/x86/bits/shm.h
> +++ b/sysdeps/unix/sysv/linux/x86/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() */
> #ifndef __x86_64__
> - unsigned long int __unused1;
> + unsigned long int __glibc_reserved1;
> #endif
> __time_t shm_dtime; /* time of last shmdt() */
> #ifndef __x86_64__
> - unsigned long int __unused2;
> + unsigned long int __glibc_reserved2;
> #endif
> __time_t shm_ctime; /* time of last change by shmctl() */
> #ifndef __x86_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 */
> - __syscall_ulong_t __unused4;
> - __syscall_ulong_t __unused5;
> + __syscall_ulong_t __glibc_reserved4;
> + __syscall_ulong_t __glibc_reserved5;
> };
>
> #ifdef __USE_MISC
> @@ -88,10 +88,10 @@ struct shminfo
> __syscall_ulong_t shmmni;
> __syscall_ulong_t shmseg;
> __syscall_ulong_t shmall;
> - __syscall_ulong_t __unused1;
> - __syscall_ulong_t __unused2;
> - __syscall_ulong_t __unused3;
> - __syscall_ulong_t __unused4;
> + __syscall_ulong_t __glibc_reserved1;
> + __syscall_ulong_t __glibc_reserved2;
> + __syscall_ulong_t __glibc_reserved3;
> + __syscall_ulong_t __glibc_reserved4;
> };
>
> struct shm_info
> diff --git a/sysdeps/unix/sysv/linux/x86/bits/stat.h b/sysdeps/unix/sysv/linux/x86/bits/stat.h
> index 9e2f78f..efda673 100644
> --- a/sysdeps/unix/sysv/linux/x86/bits/stat.h
> +++ b/sysdeps/unix/sysv/linux/x86/bits/stat.h
> @@ -103,11 +103,11 @@ struct stat
> __syscall_ulong_t st_ctimensec; /* Nsecs of last status change. */
> #endif
> #ifdef __x86_64__
> - __syscall_slong_t __unused[3];
> + __syscall_slong_t __glibc_reserved[3];
> #else
> # 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
> @@ -161,7 +161,7 @@ struct stat64
> __syscall_ulong_t st_ctimensec; /* Nsecs of last status change. */
> # endif
> # ifdef __x86_64__
> - __syscall_slong_t __unused[3];
> + __syscall_slong_t __glibc_reserved[3];
> # else
> __ino64_t st_ino; /* File serial number. */
> # endif
> diff --git a/sysdeps/unix/sysv/linux/xstatconv.c b/sysdeps/unix/sysv/linux/xstatconv.c
> index 858b911..60e4e10 100644
> --- a/sysdeps/unix/sysv/linux/xstatconv.c
> +++ b/sysdeps/unix/sysv/linux/xstatconv.c
> @@ -78,19 +78,19 @@ __xstat_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
> buf->st_ctime = kbuf->st_ctime;
> #endif
> #ifdef _HAVE_STAT___UNUSED1
> - buf->__unused1 = 0;
> + buf->__glibc_reserved1 = 0;
> #endif
> #ifdef _HAVE_STAT___UNUSED2
> - buf->__unused2 = 0;
> + buf->__glibc_reserved2 = 0;
> #endif
> #ifdef _HAVE_STAT___UNUSED3
> - buf->__unused3 = 0;
> + buf->__glibc_reserved3 = 0;
> #endif
> #ifdef _HAVE_STAT___UNUSED4
> - buf->__unused4 = 0;
> + buf->__glibc_reserved4 = 0;
> #endif
> #ifdef _HAVE_STAT___UNUSED5
> - buf->__unused5 = 0;
> + buf->__glibc_reserved5 = 0;
> #endif
> }
> break;
> @@ -149,19 +149,19 @@ __xstat64_conv (int vers, struct kernel_stat *kbuf, void *ubuf)
> buf->st_ctime = kbuf->st_ctime;
> #endif
> #ifdef _HAVE_STAT64___UNUSED1
> - buf->__unused1 = 0;
> + buf->__glibc_reserved1 = 0;
> #endif
> #ifdef _HAVE_STAT64___UNUSED2
> - buf->__unused2 = 0;
> + buf->__glibc_reserved2 = 0;
> #endif
> #ifdef _HAVE_STAT64___UNUSED3
> - buf->__unused3 = 0;
> + buf->__glibc_reserved3 = 0;
> #endif
> #ifdef _HAVE_STAT64___UNUSED4
> - buf->__unused4 = 0;
> + buf->__glibc_reserved4 = 0;
> #endif
> #ifdef _HAVE_STAT64___UNUSED5
> - buf->__unused5 = 0;
> + buf->__glibc_reserved5 = 0;
> #endif
> }
> break;
> @@ -254,19 +254,19 @@ __xstat32_conv (int vers, struct stat64 *kbuf, struct stat *buf)
> #endif
>
> #ifdef _HAVE_STAT___UNUSED1
> - buf->__unused1 = 0;
> + buf->__glibc_reserved1 = 0;
> #endif
> #ifdef _HAVE_STAT___UNUSED2
> - buf->__unused2 = 0;
> + buf->__glibc_reserved2 = 0;
> #endif
> #ifdef _HAVE_STAT___UNUSED3
> - buf->__unused3 = 0;
> + buf->__glibc_reserved3 = 0;
> #endif
> #ifdef _HAVE_STAT___UNUSED4
> - buf->__unused4 = 0;
> + buf->__glibc_reserved4 = 0;
> #endif
> #ifdef _HAVE_STAT___UNUSED5
> - buf->__unused5 = 0;
> + buf->__glibc_reserved5 = 0;
> #endif
> }
> break;
> diff --git a/sysdeps/x86/fpu/bits/fenv.h b/sysdeps/x86/fpu/bits/fenv.h
> index b9040cc..07cac28 100644
> --- a/sysdeps/x86/fpu/bits/fenv.h
> +++ b/sysdeps/x86/fpu/bits/fenv.h
> @@ -75,18 +75,18 @@ typedef unsigned short int fexcept_t;
> typedef struct
> {
> unsigned short int __control_word;
> - unsigned short int __unused1;
> + unsigned short int __glibc_reserved1;
> unsigned short int __status_word;
> - unsigned short int __unused2;
> + unsigned short int __glibc_reserved2;
> unsigned short int __tags;
> - unsigned short int __unused3;
> + unsigned short int __glibc_reserved3;
> unsigned int __eip;
> unsigned short int __cs_selector;
> unsigned int __opcode:11;
> - unsigned int __unused4:5;
> + unsigned int __glibc_reserved4:5;
> unsigned int __data_offset;
> unsigned short int __data_selector;
> - unsigned short int __unused5;
> + unsigned short int __glibc_reserved5;
> #ifdef __x86_64__
> unsigned int __mxcsr;
> #endif
>
Cheers,
Carlos.