diff options
| author | Alistair Francis <alistair.francis@wdc.com> | 2020-02-25 15:52:59 -0800 |
|---|---|---|
| committer | Alistair Francis <alistair.francis@wdc.com> | 2020-04-29 08:29:30 -0700 |
| commit | 05332ac38b245c1983b306aa6909abfc48988a5f (patch) | |
| tree | e364533b63e5c5a36d62b0a14bcbd76fe31f80c8 /sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h | |
| parent | 246a53d3c6aeb4ab03b5dc83144207bc6a916011 (diff) | |
| download | glibc-05332ac38b245c1983b306aa6909abfc48988a5f.tar.gz glibc-05332ac38b245c1983b306aa6909abfc48988a5f.tar.xz glibc-05332ac38b245c1983b306aa6909abfc48988a5f.zip | |
semctl: Remove the sem-pad.h file
Remove the sem-pad.h file and instead have architectures override the struct semid_ds via the bits/types/struct_semid_ds.h file. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h b/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h index 0e136961d5..4222e6a59f 100644 --- a/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h +++ b/sysdeps/unix/sysv/linux/bits/types/struct_semid_ds.h @@ -20,24 +20,27 @@ # error "Never include <bits/types/struct_semid_ds.h> directly; use <sys/sem.h> instead." #endif -#if __SEM_PAD_BEFORE_TIME -# define __SEM_PAD_TIME(NAME, RES) \ - __syscall_ulong_t __glibc_reserved ## RES; __time_t NAME -#elif __SEM_PAD_AFTER_TIME -# define __SEM_PAD_TIME(NAME, RES) \ - __time_t NAME; __syscall_ulong_t __glibc_reserved ## RES -#else -# define __SEM_PAD_TIME(NAME, RES) \ - __time_t NAME -#endif - /* Data structure describing a set of semaphores. */ +#if __TIMESIZE == 32 +struct semid_ds +{ + struct ipc_perm sem_perm; /* operation permission struct */ + __time_t sem_otime; /* last semop() time */ + __syscall_ulong_t __glibc_reserved1; + __time_t sem_ctime; /* last time changed by semctl() */ + __syscall_ulong_t __glibc_reserved2; + __syscall_ulong_t sem_nsems; /* number of semaphores in set */ + __syscall_ulong_t __glibc_reserved3; + __syscall_ulong_t __glibc_reserved4; +}; +#else struct semid_ds { struct ipc_perm sem_perm; /* operation permission struct */ - __SEM_PAD_TIME (sem_otime, 1); /* last semop() time */ - __SEM_PAD_TIME (sem_ctime, 2); /* last time changed by semctl() */ + __time_t sem_otime; /* last semop() time */ + __time_t sem_ctime; /* last time changed by semctl() */ __syscall_ulong_t sem_nsems; /* number of semaphores in set */ __syscall_ulong_t __glibc_reserved3; __syscall_ulong_t __glibc_reserved4; }; +#endif |