Hi!

Haha! So obvious now that you've pointed it out!! Yes, I confirm that this is the problem! I never even thought to look for such macros upstream! Thanks!

OK, can I propose a patch to uclibc-ng to change the naming of the unused fields to include "uclibc" in the name. This is in the style of glibc, which does the same (only with __glibc_unused)

Signed off: Ed Wildgoose lists@wildgooses.com

--- /usr/include/bits/stat.h.orig 2020-06-11 16:14:05.995149761 +0000 +++ /usr/include/bits/stat.h    2020-06-11 16:14:47.344220485 +0000 @@ -99,11 +99,11 @@      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 __unused5; +    unsigned long int __uclibc_unused4; +    unsigned long int __uclibc_unused5;  # else      __ino64_t st_ino;            /* File serial number.    */  # endif @@ -160,7 +160,7 @@      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

On 10/06/2020 22:00, Yann Sionneau wrote:

Hello Ed,

Maybe it is due to this https://github.com/rsmarples/dhcpcd/blob/709e6b1a38ef87ada75354e968a9b35eca3... ?

Could you try renaming __unused[3] as ___unused[3] (with an extra leading '_') to see if it compiles?

Regards,

Yann

Le 10/06/2020 à 22:51, Ed W a écrit :

...

Hi, Could someone please take a look at my errors below and see if this is a uclibc problem? I'm struggling to understand.

System is gentoo/hardened/uclibc-ng. Using gcc-9.3.0, uclibc-1.0.33 in a chroot on x86-64

Using dhcpcd-8+, ie observe the same on 9.x and various 8.x versions. Specifically testing dhcpcd-8.1.9 in this case.

Error on compilation looks like:

In file included from /usr/include/sys/stat.h:106,                  from /usr/include/fcntl.h:37,                  from if.c:58: /usr/include/bits/stat.h:102:22: error: expected identifier or '(' before '[' token   102 |     long int __unused[3];       |                      ^

If I comment out the "#include <fcntl.h>" in if.c, then it compiles without error.

Also, if I convert the definition from the form "__unused[3]" to separate lines like "long int __unused1", etc, then it also compiles without error.

I'm not clear why an array definition in a struct is triggering this compiler error? Any thoughts? Is this something that dhcpcd is doing wrong?

Thanks for any help. Full log below

Ed W

# ./configure configure args: Deriving operating system from ... x86_64-unknown-linux Configuring dhcpcd for ... linux Enabling INET support Enabling ARP support Enabling ARPing support Enabling IPv4LL support Enabling INET6 support Enabling DHCPv6 support Enabling Authentication Using compiler .. cc cc (Gentoo Hardened 9.3.0 p2) 9.3.0 dhcpcd-definitions.conf will be embedded in dhcpcd itself Testing for nl80211 ... yes Testing for IN6_ADDR_GEN_MODE_NONE ... yes Testing for getifaddrs ... yes Testing for ifaddrs.ifa_addrflags ... no Testing for clock_gettime ... yes Testing for inet_ntoa ... yes Testing for arc4random ... no Testing for arc4random_uniform ... no Testing for open_memstream ... yes Testing for pidfile_lock ... no Testing for setproctitle ... no Testing for strlcpy ... yes Testing for strtoi ... no Testing for consttime_memequal ... no Testing for dprintf ... yes Testing for TAILQ_FOREACH_SAFE ... no Testing for TAILQ_FOREACH_MUTABLE ... no Testing for TAILQ_CONCAT ...yes Testing for rb_tree_init ... no Testing for reallocarray ... no Testing for kqueue1 ... no Testing for kqueue ... no Testing for epoll ... yes Testing for be64enc ... no Testing for fls64 ... no Testing for MD5Init ... no Testing for sha2.h ... no Testing for SHA256_Init ... no Testing for SHA256Init ... no Testing for hmac ... no Checking for libudev ... yes Checking udev_monitor_filter_add_match_subsystem_devtype ... yes Checking udev_device_get_is_initialized ... yes Testing for dlopen ... yes Checking for ntpd ... /usr/sbin/ntpd (50-ntp.conf) Checking for chronyd ... not found Checking for ypbind ... not found

SYSCONFDIR =        /etc    SBINDIR =        /sbin    LIBDIR =        /lib    LIBEXECDIR =        /libexec    DBDIR =        /var/db/dhcpcd    RUNDIR =        /var/run    MANDIR =        /usr/share/man    DATADIR =        /usr/share    HOOKSCRIPTS =    50-ntp.conf    EGHOOKSCRIPTS =    STATUSARG =

chroot:twocubed dhcpcd-8.1.9 # make for x in src hooks; do cd $x; make all || exit $?; cd ..; done make[1]: Entering directory '/var/tmp/portage/net-misc/dhcpcd-8.1.9/work/dhcpcd-8.1.9/src' cc -O2 -std=c99 -DHAVE_CONFIG_H -DNDEBUG -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DINET -DARP -DARPING -DIPV4LL -DINET6 -DDHCP6 -DAUTH -DPLUGIN_DEV -I.. -I../src -I./crypt -c common.c -o common.o cc -O2 -std=c99 -DHAVE_CONFIG_H -DNDEBUG -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DINET -DARP -DARPING -DIPV4LL -DINET6 -DDHCP6 -DAUTH -DPLUGIN_DEV -I.. -I../src -I./crypt -c control.c -o control.o cc -O2 -std=c99 -DHAVE_CONFIG_H -DNDEBUG -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DINET -DARP -DARPING -DIPV4LL -DINET6 -DDHCP6 -DAUTH -DPLUGIN_DEV -I.. -I../src -I./crypt -c dhcpcd.c -o dhcpcd.o cc -O2 -std=c99 -DHAVE_CONFIG_H -DNDEBUG -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DINET -DARP -DARPING -DIPV4LL -DINET6 -DDHCP6 -DAUTH -DPLUGIN_DEV -I.. -I../src -I./crypt -c duid.c -o duid.o cc -O2 -std=c99 -DHAVE_CONFIG_H -DNDEBUG -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DINET -DARP -DARPING -DIPV4LL -DINET6 -DDHCP6 -DAUTH -DPLUGIN_DEV -I.. -I../src -I./crypt -c eloop.c -o eloop.o cc -O2 -std=c99 -DHAVE_CONFIG_H -DNDEBUG -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DINET -DARP -DARPING -DIPV4LL -DINET6 -DDHCP6 -DAUTH -DPLUGIN_DEV -I.. -I../src -I./crypt -c logerr.c -o logerr.o cc -O2 -std=c99 -DHAVE_CONFIG_H -DNDEBUG -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DINET -DARP -DARPING -DIPV4LL -DINET6 -DDHCP6 -DAUTH -DPLUGIN_DEV -I.. -I../src -I./crypt -c if.c -o if.o In file included from /usr/include/sys/stat.h:106,                  from /usr/include/fcntl.h:37,                  from if.c:58: /usr/include/bits/stat.h:102:22: error: expected identifier or '(' before '[' token   102 |     long int __unused[3];       |                      ^ /usr/include/bits/stat.h:163:22: error: expected identifier or '(' before '[' token   163 |     long int __unused[3];       |                      ^ make[1]: *** [Makefile:55: if.o] Error 1 make[1]: Leaving directory '/var/tmp/portage/net-misc/dhcpcd-8.1.9/work/dhcpcd-8.1.9/src' make: *** [Makefile:24: all] Error 2

---

devel mailing list devel@uclibc-ng.org https://mailman.uclibc-ng.org/cgi-bin/mailman/listinfo/devel

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

Signed-off-by: Ed Wildgoose lists@wildgooses.com

---  libc/sysdeps/linux/alpha/bits/ipc.h           |  4 ++--  libc/sysdeps/linux/alpha/bits/msq.h           |  4 ++--  libc/sysdeps/linux/alpha/bits/sem.h           |  4 ++--  libc/sysdeps/linux/alpha/bits/shm.h           | 12 +++++-----  libc/sysdeps/linux/alpha/bits/stat.h          |  4 ++--  libc/sysdeps/linux/arm/bits/kernel_stat.h     |  4 ++--  libc/sysdeps/linux/arm/bits/shm.h             | 18 +++++++-------  libc/sysdeps/linux/bfin/bits/kernel_stat.h    |  4 ++--  libc/sysdeps/linux/c6x/bits/ipc.h             |  4 ++--  libc/sysdeps/linux/common-generic/bits/stat.h |  8 +++----  libc/sysdeps/linux/common/bits/ipc.h          |  4 ++--  libc/sysdeps/linux/common/bits/msq.h          | 10 ++++----  libc/sysdeps/linux/common/bits/sem.h          |  8 +++----  libc/sysdeps/linux/common/bits/shm.h          | 18 +++++++-------  libc/sysdeps/linux/common/bits/stat.h         |  4 ++--  libc/sysdeps/linux/common/bits/utmp.h         |  2 +-  libc/sysdeps/linux/common/bits/utmpx.h        |  2 +-  libc/sysdeps/linux/common/sysctl.c            |  2 +-  libc/sysdeps/linux/cris/bits/kernel_stat.h    |  4 ++--  libc/sysdeps/linux/csky/bits/kernel_stat.h    |  4 ++--  libc/sysdeps/linux/csky/bits/shm.h            | 18 +++++++-------  libc/sysdeps/linux/frv/bits/kernel_stat.h     |  4 ++--  libc/sysdeps/linux/frv/bits/stat.h            | 16 ++++++-------  libc/sysdeps/linux/hppa/bits/ipc.h            |  4 ++--  libc/sysdeps/linux/i386/bits/fenv.h           | 10 ++++----  libc/sysdeps/linux/i386/bits/kernel_stat.h    |  4 ++--  libc/sysdeps/linux/ia64/bits/ipc.h            |  4 ++--  libc/sysdeps/linux/ia64/bits/msq.h            |  4 ++--  libc/sysdeps/linux/ia64/bits/sem.h            |  4 ++--  libc/sysdeps/linux/ia64/bits/shm.h            | 12 +++++-----  libc/sysdeps/linux/ia64/bits/stat.h           |  4 ++--  libc/sysdeps/linux/lm32/bits/kernel_stat.h    |  8 +++----  libc/sysdeps/linux/m68k/bits/kernel_stat.h    |  4 ++--  libc/sysdeps/linux/m68k/bits/stat.h           |  4 ++--  libc/sysdeps/linux/metag/bits/ipc.h           |  4 ++--  libc/sysdeps/linux/mips/bits/ipc.h            |  4 ++--  libc/sysdeps/linux/mips/bits/msq.h            |  4 ++--  libc/sysdeps/linux/mips/bits/sem.h            |  4 ++--  libc/sysdeps/linux/mips/bits/shm.h            | 12 +++++-----  libc/sysdeps/linux/nds32/bits/kernel_stat.h   |  4 ++--  libc/sysdeps/linux/nds32/bits/shm.h           | 18 +++++++-------  libc/sysdeps/linux/nds32/bits/stat.h          |  4 ++--  libc/sysdeps/linux/powerpc/bits/ipc.h         |  8 +++----  libc/sysdeps/linux/powerpc/bits/kernel_stat.h |  4 ++--  libc/sysdeps/linux/powerpc/bits/msq.h         | 10 ++++----  libc/sysdeps/linux/powerpc/bits/sem.h         |  8 +++----  libc/sysdeps/linux/powerpc/bits/shm.h         | 20 ++++++++--------  libc/sysdeps/linux/powerpc/bits/stat.h        |  8 +++----  libc/sysdeps/linux/riscv64/bits/shm.h         | 18 +++++++-------  libc/sysdeps/linux/sh/bits/kernel_stat.h      |  4 ++--  libc/sysdeps/linux/sh/bits/shm.h              | 18 +++++++-------  libc/sysdeps/linux/sparc/bits/fcntl.h         |  4 ++--  libc/sysdeps/linux/sparc/bits/ipc.h           |  4 ++--  libc/sysdeps/linux/sparc/bits/msq.h           |  4 ++--  libc/sysdeps/linux/sparc/bits/sem.h           |  4 ++--  libc/sysdeps/linux/sparc/bits/shm.h           | 12 +++++-----  libc/sysdeps/linux/sparc/bits/stat.h          |  8 +++----  libc/sysdeps/linux/sparc64/bits/fcntl.h       |  4 ++--  libc/sysdeps/linux/sparc64/bits/ipc.h         |  4 ++--  libc/sysdeps/linux/sparc64/bits/msq.h         |  4 ++--  libc/sysdeps/linux/sparc64/bits/sem.h         |  4 ++--  libc/sysdeps/linux/sparc64/bits/shm.h         | 12 +++++-----  libc/sysdeps/linux/sparc64/bits/stat.h        |  8 +++----  libc/sysdeps/linux/tile/bits/shm.h            | 18 +++++++-------  libc/sysdeps/linux/x86_64/bits/fenv.h         | 10 ++++----  libc/sysdeps/linux/x86_64/bits/kernel_stat.h  |  2 +-  libc/sysdeps/linux/x86_64/bits/msq.h          | 10 ++++----  libc/sysdeps/linux/x86_64/bits/sem.h          |  8 +++----  libc/sysdeps/linux/x86_64/bits/shm.h          | 18 +++++++-------  libc/sysdeps/linux/x86_64/bits/stat.h         |  8 +++----  libc/sysdeps/linux/xtensa/bits/ipc.h          |  4 ++--  libc/sysdeps/linux/xtensa/bits/kernel_stat.h  |  6 ++---  libc/sysdeps/linux/xtensa/bits/msq.h          | 16 ++++++-------  libc/sysdeps/linux/xtensa/bits/shm.h          | 24 +++++++++----------  libc/sysdeps/linux/xtensa/bits/stat.h         |  8 +++----  libpthread/nptl/sysdeps/i386/tls.h            |  2 +-  libpthread/nptl/sysdeps/x86_64/tls.h          |  4 ++--  77 files changed, 293 insertions(+), 293 deletions(-)

diff --git a/libc/sysdeps/linux/alpha/bits/ipc.h b/libc/sysdeps/linux/alpha/bits/ipc.h index e2e20d149..28b21544d 100644 --- a/libc/sysdeps/linux/alpha/bits/ipc.h +++ b/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 __unused2; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2;    }; diff --git a/libc/sysdeps/linux/alpha/bits/msq.h b/libc/sysdeps/linux/alpha/bits/msq.h index ea0dba0cc..3020f6ff5 100644 --- a/libc/sysdeps/linux/alpha/bits/msq.h +++ b/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 __unused2; +  unsigned long int __uclibc_unused1; +  unsigned long int __uclibc_unused2;  };

#ifdef __USE_MISC diff --git a/libc/sysdeps/linux/alpha/bits/sem.h b/libc/sysdeps/linux/alpha/bits/sem.h index 0bd103620..2092009e7 100644 --- a/libc/sysdeps/linux/alpha/bits/sem.h +++ b/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 __unused2; +  unsigned long int __uclibc_unused1; +  unsigned long int __uclibc_unused2;  };

/* The user should define a union like the following to use it for arguments diff --git a/libc/sysdeps/linux/alpha/bits/shm.h b/libc/sysdeps/linux/alpha/bits/shm.h index e62b05afb..4b6ae8d46 100644 --- a/libc/sysdeps/linux/alpha/bits/shm.h +++ b/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 __unused2; +    unsigned long int __uclibc_unused1; +    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 __unused2; -    unsigned long int __unused3; -    unsigned long int __unused4; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2; +    unsigned long int __uclibc_unused3; +    unsigned long int __uclibc_unused4;    };

struct shm_info diff --git a/libc/sysdeps/linux/alpha/bits/stat.h b/libc/sysdeps/linux/alpha/bits/stat.h index cbcdf2145..88bc6617d 100644 --- a/libc/sysdeps/linux/alpha/bits/stat.h +++ b/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

diff --git a/libc/sysdeps/linux/arm/bits/kernel_stat.h b/libc/sysdeps/linux/arm/bits/kernel_stat.h index 7bd89f9ab..b293dfc05 100644 --- a/libc/sysdeps/linux/arm/bits/kernel_stat.h +++ b/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  __unused5; +    unsigned long  __uclibc_unused4; +    unsigned long  __uclibc_unused5;  };

struct kernel_stat64 { diff --git a/libc/sysdeps/linux/arm/bits/shm.h b/libc/sysdeps/linux/arm/bits/shm.h index 2708c58ff..86245faff 100644 --- a/libc/sysdeps/linux/arm/bits/shm.h +++ b/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 __unused5; +    unsigned long int __uclibc_unused4; +    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 __unused2; -    unsigned long int __unused3; -    unsigned long int __unused4; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2; +    unsigned long int __uclibc_unused3; +    unsigned long int __uclibc_unused4;    };

struct shm_info diff --git a/libc/sysdeps/linux/bfin/bits/kernel_stat.h b/libc/sysdeps/linux/bfin/bits/kernel_stat.h index 7700d6109..2c2e818d6 100644 --- a/libc/sysdeps/linux/bfin/bits/kernel_stat.h +++ b/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  __unused5; +    unsigned long  __uclibc_unused4; +    unsigned long  __uclibc_unused5;  };

struct kernel_stat64 { diff --git a/libc/sysdeps/linux/c6x/bits/ipc.h b/libc/sysdeps/linux/c6x/bits/ipc.h index 4e9236eb6..c28a2ee3b 100644 --- a/libc/sysdeps/linux/c6x/bits/ipc.h +++ b/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 __unused2; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2;    }; diff --git a/libc/sysdeps/linux/common-generic/bits/stat.h b/libc/sysdeps/linux/common-generic/bits/stat.h index 4ade63f6f..2f72d357a 100644 --- a/libc/sysdeps/linux/common-generic/bits/stat.h +++ b/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 __unused5; +    unsigned int __uclibc_unused4; +    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 __unused5; +    unsigned int __uclibc_unused4; +    unsigned int __uclibc_unused5;  };  #endif

diff --git a/libc/sysdeps/linux/common/bits/ipc.h b/libc/sysdeps/linux/common/bits/ipc.h index ca7f58cc7..cf7da2a29 100644 --- a/libc/sysdeps/linux/common/bits/ipc.h +++ b/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 __unused2; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2;    }; diff --git a/libc/sysdeps/linux/common/bits/msq.h b/libc/sysdeps/linux/common/bits/msq.h index a1c3ea43d..b594cfff2 100644 --- a/libc/sysdeps/linux/common/bits/msq.h +++ b/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 __unused5; +  unsigned long int __uclibc_unused4; +  unsigned long int __uclibc_unused5;  };

#ifdef __USE_MISC diff --git a/libc/sysdeps/linux/common/bits/sem.h b/libc/sysdeps/linux/common/bits/sem.h index 3fb10d42f..910c4b714 100644 --- a/libc/sysdeps/linux/common/bits/sem.h +++ b/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 __unused4; +  unsigned long int __uclibc_unused3; +  unsigned long int __uclibc_unused4;  };

/* The user should define a union like the following to use it for arguments diff --git a/libc/sysdeps/linux/common/bits/shm.h b/libc/sysdeps/linux/common/bits/shm.h index 88bf7a8aa..8906e262b 100644 --- a/libc/sysdeps/linux/common/bits/shm.h +++ b/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 __unused5; +    unsigned long int __uclibc_unused4; +    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 __unused2; -    unsigned long int __unused3; -    unsigned long int __unused4; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2; +    unsigned long int __uclibc_unused3; +    unsigned long int __uclibc_unused4;    };

struct shm_info diff --git a/libc/sysdeps/linux/common/bits/stat.h b/libc/sysdeps/linux/common/bits/stat.h index 19e2f4e13..07c09f50a 100644 --- a/libc/sysdeps/linux/common/bits/stat.h +++ b/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 __unused5; +    unsigned long int __uclibc_unused4; +    unsigned long int __uclibc_unused5;  #else      __ino64_t st_ino;            /* File serial number.    */  #endif diff --git a/libc/sysdeps/linux/common/bits/utmp.h b/libc/sysdeps/linux/common/bits/utmp.h index 6ece31e34..9671d9382 100644 --- a/libc/sysdeps/linux/common/bits/utmp.h +++ b/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.  */ diff --git a/libc/sysdeps/linux/common/bits/utmpx.h b/libc/sysdeps/linux/common/bits/utmpx.h index 815fc90b8..3315ef5e6 100644 --- a/libc/sysdeps/linux/common/bits/utmpx.h +++ b/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.  */  };

diff --git a/libc/sysdeps/linux/common/sysctl.c b/libc/sysdeps/linux/common/sysctl.c index 75f9236d0..d3e28f919 100644 --- a/libc/sysdeps/linux/common/sysctl.c +++ b/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; diff --git a/libc/sysdeps/linux/cris/bits/kernel_stat.h b/libc/sysdeps/linux/cris/bits/kernel_stat.h index 619f35e9e..9038a5ab5 100644 --- a/libc/sysdeps/linux/cris/bits/kernel_stat.h +++ b/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  __unused5; +    unsigned long  __uclibc_unused4; +    unsigned long  __uclibc_unused5;  };

/* This matches struct kernel_stat64 in glibc2.1, hence the absolutely diff --git a/libc/sysdeps/linux/csky/bits/kernel_stat.h b/libc/sysdeps/linux/csky/bits/kernel_stat.h index dae77fd02..617632f48 100644 --- a/libc/sysdeps/linux/csky/bits/kernel_stat.h +++ b/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  __unused5; +    unsigned long  __uclibc_unused4; +    unsigned long  __uclibc_unused5;  };

struct kernel_stat64 { diff --git a/libc/sysdeps/linux/csky/bits/shm.h b/libc/sysdeps/linux/csky/bits/shm.h index dced1321e..d464318ec 100644 --- a/libc/sysdeps/linux/csky/bits/shm.h +++ b/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 __unused5; +    unsigned long int __uclibc_unused4; +    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 __unused2; -    unsigned long int __unused3; -    unsigned long int __unused4; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2; +    unsigned long int __uclibc_unused3; +    unsigned long int __uclibc_unused4;    };

struct shm_info diff --git a/libc/sysdeps/linux/frv/bits/kernel_stat.h b/libc/sysdeps/linux/frv/bits/kernel_stat.h index 1cf521044..cda016ce4 100644 --- a/libc/sysdeps/linux/frv/bits/kernel_stat.h +++ b/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 */ diff --git a/libc/sysdeps/linux/frv/bits/stat.h b/libc/sysdeps/linux/frv/bits/stat.h index e6a1944bb..381d207f2 100644 --- a/libc/sysdeps/linux/frv/bits/stat.h +++ b/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

diff --git a/libc/sysdeps/linux/hppa/bits/ipc.h b/libc/sysdeps/linux/hppa/bits/ipc.h index e634a74b3..fc71db409 100644 --- a/libc/sysdeps/linux/hppa/bits/ipc.h +++ b/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 __unused2; +    unsigned long long int __uclibc_unused1; +    unsigned long long int __uclibc_unused2;    }; diff --git a/libc/sysdeps/linux/i386/bits/fenv.h b/libc/sysdeps/linux/i386/bits/fenv.h index 9bd976fc1..2462b7477 100644 --- a/libc/sysdeps/linux/i386/bits/fenv.h +++ b/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;

diff --git a/libc/sysdeps/linux/i386/bits/kernel_stat.h b/libc/sysdeps/linux/i386/bits/kernel_stat.h index 231a984b4..ffe70cbf7 100644 --- a/libc/sysdeps/linux/i386/bits/kernel_stat.h +++ b/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  __unused5; +    unsigned long  __uclibc_unused4; +    unsigned long  __uclibc_unused5;  };

struct kernel_stat64 { diff --git a/libc/sysdeps/linux/ia64/bits/ipc.h b/libc/sysdeps/linux/ia64/bits/ipc.h index eb014d7b9..6c93a1fa6 100644 --- a/libc/sysdeps/linux/ia64/bits/ipc.h +++ b/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 __unused2; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2;    }; diff --git a/libc/sysdeps/linux/ia64/bits/msq.h b/libc/sysdeps/linux/ia64/bits/msq.h index 2dea98627..fe2181da2 100644 --- a/libc/sysdeps/linux/ia64/bits/msq.h +++ b/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 __unused2; +  unsigned long int __uclibc_unused1; +  unsigned long int __uclibc_unused2;  };

#ifdef __USE_MISC diff --git a/libc/sysdeps/linux/ia64/bits/sem.h b/libc/sysdeps/linux/ia64/bits/sem.h index aa56e155d..b081cb038 100644 --- a/libc/sysdeps/linux/ia64/bits/sem.h +++ b/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 __unused2; +  unsigned long int __uclibc_unused1; +  unsigned long int __uclibc_unused2;  };

/* The user should define a union like the following to use it for arguments diff --git a/libc/sysdeps/linux/ia64/bits/shm.h b/libc/sysdeps/linux/ia64/bits/shm.h index 0d0c96e6f..d91c90459 100644 --- a/libc/sysdeps/linux/ia64/bits/shm.h +++ b/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 __unused2; +    unsigned long int __uclibc_unused1; +    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 __unused2; -    unsigned long int __unused3; -    unsigned long int __unused4; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2; +    unsigned long int __uclibc_unused3; +    unsigned long int __uclibc_unused4;    };

struct shm_info diff --git a/libc/sysdeps/linux/ia64/bits/stat.h b/libc/sysdeps/linux/ia64/bits/stat.h index e868b0950..6723166e7 100644 --- a/libc/sysdeps/linux/ia64/bits/stat.h +++ b/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

diff --git a/libc/sysdeps/linux/lm32/bits/kernel_stat.h b/libc/sysdeps/linux/lm32/bits/kernel_stat.h index c998b56c7..0dc589a5b 100644 --- a/libc/sysdeps/linux/lm32/bits/kernel_stat.h +++ b/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    __unused5; +        unsigned int    __uclibc_unused4; +        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    __unused5; +        unsigned int    __uclibc_unused4; +        unsigned int    __uclibc_unused5;  };

#endif  /*  _BITS_STAT_STRUCT_H */ diff --git a/libc/sysdeps/linux/m68k/bits/kernel_stat.h b/libc/sysdeps/linux/m68k/bits/kernel_stat.h index 3911c9bbf..f3b1bd645 100644 --- a/libc/sysdeps/linux/m68k/bits/kernel_stat.h +++ b/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  __unused5; +    unsigned long  __uclibc_unused4; +    unsigned long  __uclibc_unused5;  };

struct kernel_stat64 { diff --git a/libc/sysdeps/linux/m68k/bits/stat.h b/libc/sysdeps/linux/m68k/bits/stat.h index d71670db8..7b9c3d144 100644 --- a/libc/sysdeps/linux/m68k/bits/stat.h +++ b/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 __unused5; +    unsigned long int __uclibc_unused4; +    unsigned long int __uclibc_unused5;  #else      __ino64_t st_ino;            /* File serial number.    */  #endif diff --git a/libc/sysdeps/linux/metag/bits/ipc.h b/libc/sysdeps/linux/metag/bits/ipc.h index d50e39f6a..50d9514e9 100644 --- a/libc/sysdeps/linux/metag/bits/ipc.h +++ b/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 __unused2; +    unsigned long __uclibc_unused1; +    unsigned long __uclibc_unused2;    }; diff --git a/libc/sysdeps/linux/mips/bits/ipc.h b/libc/sysdeps/linux/mips/bits/ipc.h index 97a8da032..b47c1e706 100644 --- a/libc/sysdeps/linux/mips/bits/ipc.h +++ b/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 __unused2; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2;  }; diff --git a/libc/sysdeps/linux/mips/bits/msq.h b/libc/sysdeps/linux/mips/bits/msq.h index fe09cfadf..bcf1073e8 100644 --- a/libc/sysdeps/linux/mips/bits/msq.h +++ b/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 __unused5; +  unsigned long int __uclibc_unused4; +  unsigned long int __uclibc_unused5;  };

#ifdef __USE_MISC diff --git a/libc/sysdeps/linux/mips/bits/sem.h b/libc/sysdeps/linux/mips/bits/sem.h index 4d412a2cb..3e4e9682b 100644 --- a/libc/sysdeps/linux/mips/bits/sem.h +++ b/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 __unused2; +  unsigned long int __uclibc_unused1; +  unsigned long int __uclibc_unused2;  };

/* The user should define a union like the following to use it for arguments diff --git a/libc/sysdeps/linux/mips/bits/shm.h b/libc/sysdeps/linux/mips/bits/shm.h index 43869b3f4..bb87ba13d 100644 --- a/libc/sysdeps/linux/mips/bits/shm.h +++ b/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 __unused2; +    unsigned long int __uclibc_unused1; +    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 __unused2; -    unsigned long int __unused3; -    unsigned long int __unused4; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2; +    unsigned long int __uclibc_unused3; +    unsigned long int __uclibc_unused4;    };

struct shm_info diff --git a/libc/sysdeps/linux/nds32/bits/kernel_stat.h b/libc/sysdeps/linux/nds32/bits/kernel_stat.h index 9e5c40d15..3c0911c01 100644 --- a/libc/sysdeps/linux/nds32/bits/kernel_stat.h +++ b/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  __unused5; +    unsigned long  __uclibc_unused4; +    unsigned long  __uclibc_unused5;  };

struct kernel_stat64 { diff --git a/libc/sysdeps/linux/nds32/bits/shm.h b/libc/sysdeps/linux/nds32/bits/shm.h index 51e1ece7f..8904b6252 100644 --- a/libc/sysdeps/linux/nds32/bits/shm.h +++ b/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 __unused5; +    unsigned long int __uclibc_unused4; +    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 __unused2; -    unsigned long int __unused3; -    unsigned long int __unused4; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2; +    unsigned long int __uclibc_unused3; +    unsigned long int __uclibc_unused4;    };

struct shm_info diff --git a/libc/sysdeps/linux/nds32/bits/stat.h b/libc/sysdeps/linux/nds32/bits/stat.h index fe25292cb..c4e09e0f2 100644 --- a/libc/sysdeps/linux/nds32/bits/stat.h +++ b/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 __unused5; +    unsigned long int __uclibc_unused4; +    unsigned long int __uclibc_unused5;  #else      __ino64_t st_ino;            /* File serial number.    */  #endif diff --git a/libc/sysdeps/linux/powerpc/bits/ipc.h b/libc/sysdeps/linux/powerpc/bits/ipc.h index e21debf5d..f40ffbc24 100644 --- a/libc/sysdeps/linux/powerpc/bits/ipc.h +++ b/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 __unused2; +    unsigned long long int __uclibc_unused1; +    unsigned long long int __uclibc_unused2;  #else      __uint32_t __seq;        /* Sequence number.  */      __uint32_t __pad1; -    __uint64_t __unused1; -    __uint64_t __unused2; +    __uint64_t __uclibc_unused1; +    __uint64_t __uclibc_unused2;  #endif    }; diff --git a/libc/sysdeps/linux/powerpc/bits/kernel_stat.h b/libc/sysdeps/linux/powerpc/bits/kernel_stat.h index 579b5b4e2..ce62b2ba2 100644 --- a/libc/sysdeps/linux/powerpc/bits/kernel_stat.h +++ b/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 __unused5; +    unsigned long int __uclibc_unused4; +    unsigned long int __uclibc_unused5;  };

#endif    /*  _BITS_STAT_STRUCT_H */ diff --git a/libc/sysdeps/linux/powerpc/bits/msq.h b/libc/sysdeps/linux/powerpc/bits/msq.h index 70d4f06e3..995f5157b 100644 --- a/libc/sysdeps/linux/powerpc/bits/msq.h +++ b/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 __unused5; +  unsigned long __uclibc_unused4; +  unsigned long __uclibc_unused5;  };

#ifdef __USE_MISC diff --git a/libc/sysdeps/linux/powerpc/bits/sem.h b/libc/sysdeps/linux/powerpc/bits/sem.h index 271a607ca..a9d895374 100644 --- a/libc/sysdeps/linux/powerpc/bits/sem.h +++ b/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 __unused4; +  unsigned long __uclibc_unused3; +  unsigned long __uclibc_unused4;  };

/* The user should define a union like the following to use it for arguments diff --git a/libc/sysdeps/linux/powerpc/bits/shm.h b/libc/sysdeps/linux/powerpc/bits/shm.h index 63e7f6ed1..7ba17f8ad 100644 --- a/libc/sysdeps/linux/powerpc/bits/shm.h +++ b/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 __unused6; +    unsigned long __uclibc_unused5; +    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 __unused2; -    unsigned long int __unused3; -    unsigned long int __unused4; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2; +    unsigned long int __uclibc_unused3; +    unsigned long int __uclibc_unused4;    };

struct shm_info diff --git a/libc/sysdeps/linux/powerpc/bits/stat.h b/libc/sysdeps/linux/powerpc/bits/stat.h index a90043f8a..7494586b5 100644 --- a/libc/sysdeps/linux/powerpc/bits/stat.h +++ b/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 __unused5; +    unsigned long int __uclibc_unused4; +    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 __unused5; +    unsigned long int __uclibc_unused4; +    unsigned long int __uclibc_unused5;    };  # endif /* __USE_LARGEFILE64 */

diff --git a/libc/sysdeps/linux/riscv64/bits/shm.h b/libc/sysdeps/linux/riscv64/bits/shm.h index dbe4851f9..8a11c7050 100644 --- a/libc/sysdeps/linux/riscv64/bits/shm.h +++ b/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 __unused5; +    unsigned long int __uclibc_unused4; +    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 __unused2; -    unsigned long int __unused3; -    unsigned long int __unused4; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2; +    unsigned long int __uclibc_unused3; +    unsigned long int __uclibc_unused4;    };

struct shm_info diff --git a/libc/sysdeps/linux/sh/bits/kernel_stat.h b/libc/sysdeps/linux/sh/bits/kernel_stat.h index 5b51b3cd3..c32b700ae 100644 --- a/libc/sysdeps/linux/sh/bits/kernel_stat.h +++ b/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  __unused5; +    unsigned long  __uclibc_unused4; +    unsigned long  __uclibc_unused5;  };

struct kernel_stat64 { diff --git a/libc/sysdeps/linux/sh/bits/shm.h b/libc/sysdeps/linux/sh/bits/shm.h index 646e5badc..f5e8f6fd5 100644 --- a/libc/sysdeps/linux/sh/bits/shm.h +++ b/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 __unused5; +    unsigned long int __uclibc_unused4; +    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 __unused2; -    unsigned long int __unused3; -    unsigned long int __unused4; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2; +    unsigned long int __uclibc_unused3; +    unsigned long int __uclibc_unused4;    };

struct shm_info diff --git a/libc/sysdeps/linux/sparc/bits/fcntl.h b/libc/sysdeps/linux/sparc/bits/fcntl.h index 9ccc5946d..b93e3d354 100644 --- a/libc/sysdeps/linux/sparc/bits/fcntl.h +++ b/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

diff --git a/libc/sysdeps/linux/sparc/bits/ipc.h b/libc/sysdeps/linux/sparc/bits/ipc.h index 017d0e1bc..193097ff8 100644 --- a/libc/sysdeps/linux/sparc/bits/ipc.h +++ b/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 __unused2; +    unsigned long long int __uclibc_unused1; +    unsigned long long int __uclibc_unused2;    }; diff --git a/libc/sysdeps/linux/sparc/bits/msq.h b/libc/sysdeps/linux/sparc/bits/msq.h index b8bcf31bf..2558a7bcb 100644 --- a/libc/sysdeps/linux/sparc/bits/msq.h +++ b/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 __unused2; +  unsigned long int __uclibc_unused1; +  unsigned long int __uclibc_unused2;  };

#ifdef __USE_MISC diff --git a/libc/sysdeps/linux/sparc/bits/sem.h b/libc/sysdeps/linux/sparc/bits/sem.h index 3faaadd96..04c579fc6 100644 --- a/libc/sysdeps/linux/sparc/bits/sem.h +++ b/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 __unused2; +  unsigned long int __uclibc_unused1; +  unsigned long int __uclibc_unused2;  };

/* The user should define a union like the following to use it for arguments diff --git a/libc/sysdeps/linux/sparc/bits/shm.h b/libc/sysdeps/linux/sparc/bits/shm.h index 7ef10fc76..3f519ce8e 100644 --- a/libc/sysdeps/linux/sparc/bits/shm.h +++ b/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 __unused2; +    unsigned long int __uclibc_unused1; +    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 __unused2; -    unsigned long __unused3; -    unsigned long __unused4; +    unsigned long __uclibc_unused1; +    unsigned long __uclibc_unused2; +    unsigned long __uclibc_unused3; +    unsigned long __uclibc_unused4;    };

struct shm_info diff --git a/libc/sysdeps/linux/sparc/bits/stat.h b/libc/sysdeps/linux/sparc/bits/stat.h index 7ec7d9b23..b88885fe2 100644 --- a/libc/sysdeps/linux/sparc/bits/stat.h +++ b/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 __unused5; +    unsigned long int __uclibc_unused4; +    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 __unused5; +    unsigned long int __uclibc_unused4; +    unsigned long int __uclibc_unused5;    };  #endif

diff --git a/libc/sysdeps/linux/sparc64/bits/fcntl.h b/libc/sysdeps/linux/sparc64/bits/fcntl.h index dad3470b8..2443a92c8 100644 --- a/libc/sysdeps/linux/sparc64/bits/fcntl.h +++ b/libc/sysdeps/linux/sparc64/bits/fcntl.h @@ -159,7 +159,7 @@ struct flock      __off64_t l_len;    /* Size of the locked area; zero means until EOF.  */  #endif      __pid_t l_pid;    /* Process holding the lock.  */ -    short int __unused; +    short int __uclibc_unused;    };

#ifdef __USE_LARGEFILE64 @@ -170,7 +170,7 @@ struct flock64      __off64_t l_start;    /* Offset where the lock begins.  */      __off64_t l_len;    /* Size of the locked area; zero means until EOF.  */      __pid_t l_pid;    /* Process holding the lock.  */ -    short int __unused; +    short int __uclibc_unused;    };  #endif

diff --git a/libc/sysdeps/linux/sparc64/bits/ipc.h b/libc/sysdeps/linux/sparc64/bits/ipc.h index 7fedafa61..56247ab4e 100644 --- a/libc/sysdeps/linux/sparc64/bits/ipc.h +++ b/libc/sysdeps/linux/sparc64/bits/ipc.h @@ -48,6 +48,6 @@ struct ipc_perm      __mode_t mode;            /* Read/write permission.  */      unsigned short int __pad1;      unsigned short int __seq;        /* Sequence number.  */ -    unsigned long long int __unused1; -    unsigned long long int __unused2; +    unsigned long long int __uclibc_unused1; +    unsigned long long int __uclibc_unused2;    }; diff --git a/libc/sysdeps/linux/sparc64/bits/msq.h b/libc/sysdeps/linux/sparc64/bits/msq.h index f514e442c..f31caf2f7 100644 --- a/libc/sysdeps/linux/sparc64/bits/msq.h +++ b/libc/sysdeps/linux/sparc64/bits/msq.h @@ -44,8 +44,8 @@ struct msqid_ds    msglen_t msg_qbytes;        /* max number of bytes allowed on queue */    __pid_t msg_lspid;        /* pid of last msgsnd() */    __pid_t msg_lrpid;        /* pid of last msgrcv() */ -  unsigned long int __unused1; -  unsigned long int __unused2; +  unsigned long int __uclibc_unused1; +  unsigned long int __uclibc_unused2;  };

#ifdef __USE_MISC diff --git a/libc/sysdeps/linux/sparc64/bits/sem.h b/libc/sysdeps/linux/sparc64/bits/sem.h index acc21742d..9e88db2e2 100644 --- a/libc/sysdeps/linux/sparc64/bits/sem.h +++ b/libc/sysdeps/linux/sparc64/bits/sem.h @@ -40,8 +40,8 @@ struct semid_ds    __time_t sem_otime;            /* last semop() time */    __time_t sem_ctime;            /* last time changed by semctl() */    unsigned long int sem_nsems;        /* number of semaphores in set */ -  unsigned long int __unused1; -  unsigned long int __unused2; +  unsigned long int __uclibc_unused1; +  unsigned long int __uclibc_unused2;  };

/* The user should define a union like the following to use it for arguments diff --git a/libc/sysdeps/linux/sparc64/bits/shm.h b/libc/sysdeps/linux/sparc64/bits/shm.h index a5d8c3464..b76c4c32b 100644 --- a/libc/sysdeps/linux/sparc64/bits/shm.h +++ b/libc/sysdeps/linux/sparc64/bits/shm.h @@ -55,8 +55,8 @@ struct shmid_ds      __pid_t shm_cpid;            /* pid of creator */      __pid_t shm_lpid;            /* pid of last shmop */      shmatt_t shm_nattch;        /* number of current attaches */ -    unsigned long int __unused1; -    unsigned long int __unused2; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2;    };

#ifdef __USE_MISC @@ -78,10 +78,10 @@ struct    shminfo      unsigned long shmmni;      unsigned long shmseg;      unsigned long shmall; -    unsigned long __unused1; -    unsigned long __unused2; -    unsigned long __unused3; -    unsigned long __unused4; +    unsigned long __uclibc_unused1; +    unsigned long __uclibc_unused2; +    unsigned long __uclibc_unused3; +    unsigned long __uclibc_unused4;    };

struct shm_info diff --git a/libc/sysdeps/linux/sparc64/bits/stat.h b/libc/sysdeps/linux/sparc64/bits/stat.h index cae973b4e..8516b159c 100644 --- a/libc/sysdeps/linux/sparc64/bits/stat.h +++ b/libc/sysdeps/linux/sparc64/bits/stat.h @@ -79,8 +79,8 @@ struct stat      __time_t st_ctime;            /* Time of last status change. */      unsigned long int st_ctimensec;    /* Nsecs of last status change.  */  #endif -    unsigned long int __unused4; -    unsigned long int __unused5; +    unsigned long int __uclibc_unused4; +    unsigned long int __uclibc_unused5;    };

#ifdef __USE_LARGEFILE64 @@ -122,8 +122,8 @@ struct stat64      __time_t st_ctime;            /* Time of last status change. */      unsigned long int st_ctimensec;    /* Nsecs of last status change.  */  #endif -    unsigned long int __unused4; -    unsigned long int __unused5; +    unsigned long int __uclibc_unused4; +    unsigned long int __uclibc_unused5;    };  #endif

diff --git a/libc/sysdeps/linux/tile/bits/shm.h b/libc/sysdeps/linux/tile/bits/shm.h index dbe4851f9..8a11c7050 100644 --- a/libc/sysdeps/linux/tile/bits/shm.h +++ b/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 __unused5; +    unsigned long int __uclibc_unused4; +    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 __unused2; -    unsigned long int __unused3; -    unsigned long int __unused4; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2; +    unsigned long int __uclibc_unused3; +    unsigned long int __uclibc_unused4;    };

struct shm_info diff --git a/libc/sysdeps/linux/x86_64/bits/fenv.h b/libc/sysdeps/linux/x86_64/bits/fenv.h index 8e38c16ec..f16b64ad3 100644 --- a/libc/sysdeps/linux/x86_64/bits/fenv.h +++ b/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 diff --git a/libc/sysdeps/linux/x86_64/bits/kernel_stat.h b/libc/sysdeps/linux/x86_64/bits/kernel_stat.h index e194a7f76..d01d81d69 100644 --- a/libc/sysdeps/linux/x86_64/bits/kernel_stat.h +++ b/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 */ diff --git a/libc/sysdeps/linux/x86_64/bits/msq.h b/libc/sysdeps/linux/x86_64/bits/msq.h index 838910713..3141266bc 100644 --- a/libc/sysdeps/linux/x86_64/bits/msq.h +++ b/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 __unused5; +  unsigned long int __uclibc_unused4; +  unsigned long int __uclibc_unused5;  };

#ifdef __USE_MISC diff --git a/libc/sysdeps/linux/x86_64/bits/sem.h b/libc/sysdeps/linux/x86_64/bits/sem.h index 8c09031c7..9dfab87cb 100644 --- a/libc/sysdeps/linux/x86_64/bits/sem.h +++ b/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 __unused4; +  unsigned long int __uclibc_unused3; +  unsigned long int __uclibc_unused4;  };

/* The user should define a union like the following to use it for arguments diff --git a/libc/sysdeps/linux/x86_64/bits/shm.h b/libc/sysdeps/linux/x86_64/bits/shm.h index 3a25de562..316895853 100644 --- a/libc/sysdeps/linux/x86_64/bits/shm.h +++ b/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 __unused5; +    unsigned long int __uclibc_unused4; +    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 __unused2; -    unsigned long int __unused3; -    unsigned long int __unused4; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2; +    unsigned long int __uclibc_unused3; +    unsigned long int __uclibc_unused4;    };

struct shm_info diff --git a/libc/sysdeps/linux/x86_64/bits/stat.h b/libc/sysdeps/linux/x86_64/bits/stat.h index e25f01521..a7412c8f9 100644 --- a/libc/sysdeps/linux/x86_64/bits/stat.h +++ b/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 __unused5; +    unsigned long int __uclibc_unused4; +    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 diff --git a/libc/sysdeps/linux/xtensa/bits/ipc.h b/libc/sysdeps/linux/xtensa/bits/ipc.h index 2ad5fc0a2..f4222de8c 100644 --- a/libc/sysdeps/linux/xtensa/bits/ipc.h +++ b/libc/sysdeps/linux/xtensa/bits/ipc.h @@ -48,6 +48,6 @@ struct ipc_perm      __gid_t cgid;            /* Creator's group ID.  */      unsigned int mode;            /* Read/write permission.  */      unsigned int __seq;            /* Sequence number.  */ -    unsigned long int __unused1; -    unsigned long int __unused2; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2;    }; diff --git a/libc/sysdeps/linux/xtensa/bits/kernel_stat.h b/libc/sysdeps/linux/xtensa/bits/kernel_stat.h index 5e4f5c4e5..d884344d3 100644 --- a/libc/sysdeps/linux/xtensa/bits/kernel_stat.h +++ b/libc/sysdeps/linux/xtensa/bits/kernel_stat.h @@ -33,13 +33,13 @@ struct kernel_stat64 {      unsigned long long st_rdev;    /* Device number, if device. */      long long st_size;        /* Size of file, in bytes. */      unsigned long st_blksize;    /* Optimal block size for I/O. */ -    unsigned long __unused2; +    unsigned long __uclibc_unused2;      unsigned long long st_blocks;    /* Number 512-byte blocks allocated. */      struct timespec st_atim;    /* Time of last access. */      struct timespec st_mtim;    /* Time of last modification. */      struct timespec st_ctim;    /* Time of last status change. */ -    unsigned long __unused4; -    unsigned long __unused5; +    unsigned long __uclibc_unused4; +    unsigned long __uclibc_unused5;  };

#endif    /* _BITS_STAT_STRUCT_H */ diff --git a/libc/sysdeps/linux/xtensa/bits/msq.h b/libc/sysdeps/linux/xtensa/bits/msq.h index e4f3fa317..0f65b4274 100644 --- a/libc/sysdeps/linux/xtensa/bits/msq.h +++ b/libc/sysdeps/linux/xtensa/bits/msq.h @@ -38,19 +38,19 @@ struct msqid_ds  {    struct ipc_perm msg_perm;    /* structure describing operation permission */  #if defined (__XTENSA_EB__) -  unsigned long int __unused1; +  unsigned long int __uclibc_unused1;    __time_t msg_stime;        /* time of last msgsnd command */ -  unsigned long int __unused2; +  unsigned long int __uclibc_unused2;    __time_t msg_rtime;        /* time of last msgrcv command */ -  unsigned long int __unused3; +  unsigned long int __uclibc_unused3;    __time_t msg_ctime;        /* time of last change */  #elif defined (__XTENSA_EL__)    __time_t msg_stime;        /* time of last msgsnd command */ -  unsigned long int __unused1; +  unsigned long int __uclibc_unused1;    __time_t msg_rtime;        /* time of last msgrcv command */ -  unsigned long int __unused2; +  unsigned long int __uclibc_unused2;    __time_t msg_ctime;        /* time of last change */ -  unsigned long int __unused3; +  unsigned long int __uclibc_unused3;  #else  # error endian order not defined  #endif @@ -59,8 +59,8 @@ struct msqid_ds    msglen_t msg_qbytes;        /* max number of bytes allowed on queue */    __pid_t msg_lspid;        /* pid of last msgsnd() */    __pid_t msg_lrpid;        /* pid of last msgrcv() */ -  unsigned long int __unused4; -  unsigned long int __unused5; +  unsigned long int __uclibc_unused4; +  unsigned long int __uclibc_unused5;  };

#ifdef __USE_MISC diff --git a/libc/sysdeps/linux/xtensa/bits/shm.h b/libc/sysdeps/linux/xtensa/bits/shm.h index d288a1cca..d1e13cb49 100644 --- a/libc/sysdeps/linux/xtensa/bits/shm.h +++ b/libc/sysdeps/linux/xtensa/bits/shm.h @@ -52,17 +52,17 @@ struct shmid_ds      size_t shm_segsz;            /* size of segment in bytes */  #if defined (__XTENSA_EL__)      __time_t shm_atime;            /* time of last shmat() */ -    unsigned long int __unused1; +    unsigned long int __uclibc_unused1;      __time_t shm_dtime;            /* time of last shmdt() */ -    unsigned long int __unused2; +    unsigned long int __uclibc_unused2;      __time_t shm_ctime;            /* time of last change by shmctl() */ -    unsigned long int __unused3; +    unsigned long int __uclibc_unused3;  #elif defined (__XTENSA_EB__) -    unsigned long int __unused1; +    unsigned long int __uclibc_unused1;      __time_t shm_atime;            /* time of last shmat() */ -    unsigned long int __unused2; +    unsigned long int __uclibc_unused2;      __time_t shm_dtime;            /* time of last shmdt() */ -    unsigned long int __unused3; +    unsigned long int __uclibc_unused3;      __time_t shm_ctime;            /* time of last change by shmctl() */  #else  # error endian order not defined @@ -70,8 +70,8 @@ struct shmid_ds      __pid_t shm_cpid;            /* pid of creator */      __pid_t shm_lpid;            /* pid of last shmop */      shmatt_t shm_nattch;        /* number of current attaches */ -    unsigned long int __unused4; -    unsigned long int __unused5; +    unsigned long int __uclibc_unused4; +    unsigned long int __uclibc_unused5;    };

#ifdef __USE_MISC @@ -93,10 +93,10 @@ struct    shminfo      unsigned long int shmmni;      unsigned long int shmseg;      unsigned long int shmall; -    unsigned long int __unused1; -    unsigned long int __unused2; -    unsigned long int __unused3; -    unsigned long int __unused4; +    unsigned long int __uclibc_unused1; +    unsigned long int __uclibc_unused2; +    unsigned long int __uclibc_unused3; +    unsigned long int __uclibc_unused4;    };

struct shm_info diff --git a/libc/sysdeps/linux/xtensa/bits/stat.h b/libc/sysdeps/linux/xtensa/bits/stat.h index c61b188b7..045a017fd 100644 --- a/libc/sysdeps/linux/xtensa/bits/stat.h +++ b/libc/sysdeps/linux/xtensa/bits/stat.h @@ -75,8 +75,8 @@ struct stat      __time_t st_ctime;            /* Time of last status change. */      unsigned long int st_ctimensec;    /* Nsecs of last status change.  */  #endif -    unsigned long int __unused4; -    unsigned long int __unused5; +    unsigned long int __uclibc_unused4; +    unsigned long int __uclibc_unused5;    };

#ifdef __USE_LARGEFILE64 @@ -112,8 +112,8 @@ struct stat64      __time_t st_ctime;            /* Time of last status change. */      unsigned long int st_ctimensec;    /* Nsecs of last status change.  */  #endif -    unsigned long __unused4; -    unsigned long __unused5; +    unsigned long __uclibc_unused4; +    unsigned long __uclibc_unused5;    };  #endif

diff --git a/libpthread/nptl/sysdeps/i386/tls.h b/libpthread/nptl/sysdeps/i386/tls.h index 17c80e5fc..63c77c561 100644 --- a/libpthread/nptl/sysdeps/i386/tls.h +++ b/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]; diff --git a/libpthread/nptl/sysdeps/x86_64/tls.h b/libpthread/nptl/sysdeps/x86_64/tls.h index d8b82ede9..41b3c3bf6 100644 --- a/libpthread/nptl/sysdeps/x86_64/tls.h +++ b/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];

-- 2.21.0 (Apple Git-122)