1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00

y2038: Use a common definition for shmid_ds

Instead of replicate the same definitions from struct_shmid64_ds.h
on the multiple struct_shmid_ds.h, use a common header which is included
when required (struct_shmid64_ds_helper.h).

The __USE_TIME_BITS64 is not defined internally yet, although the
internal header is used when building the 64-bit semctl implementation.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
This commit is contained in:
Adhemerval Zanella
2021-02-17 18:38:09 -03:00
parent f98beb65f5
commit 7194337c3e
8 changed files with 68 additions and 26 deletions

View File

@ -23,23 +23,27 @@
/* Data structure describing a shared memory segment. */
struct shmid_ds
{
#ifdef __USE_TIME_BITS64
# include <bits/types/struct_shmid64_ds_helper.h>
#else
struct ipc_perm shm_perm; /* operation permission struct */
#if __TIMESIZE == 32
# if __TIMESIZE == 32
unsigned long int __shm_atime_high;
__time_t shm_atime; /* time of last shmat() */
unsigned long int __shm_dtime_high;
__time_t shm_dtime; /* time of last shmdt() */
unsigned long int __shm_ctime_high;
__time_t shm_ctime; /* time of last change by shmctl() */
#else
# else
__time_t shm_atime; /* time of last shmat() */
__time_t shm_dtime; /* time of last shmdt() */
__time_t shm_ctime; /* time of last change by shmctl() */
#endif
# 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 */
__syscall_ulong_t __glibc_reserved5;
__syscall_ulong_t __glibc_reserved6;
#endif
};