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/csky | |
| 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/csky')
| -rw-r--r-- | libc/sysdeps/linux/csky/bits/kernel_stat.h | 4 | ||||
| -rw-r--r-- | libc/sysdeps/linux/csky/bits/shm.h | 18 |
2 files changed, 11 insertions, 11 deletions
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 |