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/ia64 | |
| 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/ia64')
| -rw-r--r-- | libc/sysdeps/linux/ia64/bits/ipc.h | 4 | ||||
| -rw-r--r-- | libc/sysdeps/linux/ia64/bits/msq.h | 4 | ||||
| -rw-r--r-- | libc/sysdeps/linux/ia64/bits/sem.h | 4 | ||||
| -rw-r--r-- | libc/sysdeps/linux/ia64/bits/shm.h | 12 | ||||
| -rw-r--r-- | libc/sysdeps/linux/ia64/bits/stat.h | 4 |
5 files changed, 14 insertions, 14 deletions
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 |