diff options
author | Ed Wildgoose <ed+git@wildgooses.com> | 2020-06-16 15:00:56 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2020-07-02 08:25:47 +0200 |
commit | 93277314f0ec84409e15f6e2cd616d028cb53065 (patch) | |
tree | 8d1700eaf083f9cf364eeb6f99a4845e9aeb3210 /libc/sysdeps/linux/xtensa/bits/msq.h | |
parent | a852c9941054d2cb5e50964cb9ddb975b5d11689 (diff) |
Rename __unused struct members to include a namespace
Rename various spare fields in structs to include a namespace
This should avoid accidental clashes with uses of the __unused symbol
in upstream projects. eg currently it causes a compile error in dhcpcd 8.x
due to their re-use of the __unused symbol as a macro
This follows the style of glibc which does something equivalent
Diffstat (limited to 'libc/sysdeps/linux/xtensa/bits/msq.h')
-rw-r--r-- | libc/sysdeps/linux/xtensa/bits/msq.h | 16 |
1 files changed, 8 insertions, 8 deletions
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 |