Skip to content

Commit 4704397

Browse files
committed
gnu: Update struct shmid_ds for 64-bit time
1 parent 919ff6c commit 4704397

File tree

5 files changed

+49
-17
lines changed

5 files changed

+49
-17
lines changed

src/unix/linux_like/linux/gnu/b32/arm/mod.rs

+3
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,13 @@ s! {
113113
pub shm_perm: ::ipc_perm,
114114
pub shm_segsz: ::size_t,
115115
pub shm_atime: ::time_t,
116+
#[cfg(not(gnu_time64_abi))]
116117
__unused1: ::c_ulong,
117118
pub shm_dtime: ::time_t,
119+
#[cfg(not(gnu_time64_abi))]
118120
__unused2: ::c_ulong,
119121
pub shm_ctime: ::time_t,
122+
#[cfg(not(gnu_time64_abi))]
120123
__unused3: ::c_ulong,
121124
pub shm_cpid: ::pid_t,
122125
pub shm_lpid: ::pid_t,

src/unix/linux_like/linux/gnu/b32/powerpc/mod.rs

+10-17
Original file line numberDiff line numberDiff line change
@@ -108,23 +108,6 @@ s! {
108108
__f_spare: [::c_int; 6],
109109
}
110110

111-
pub struct shmid_ds {
112-
pub shm_perm: ::ipc_perm,
113-
__glibc_reserved1: ::c_uint,
114-
pub shm_atime: ::time_t,
115-
__glibc_reserved2: ::c_uint,
116-
pub shm_dtime: ::time_t,
117-
__glibc_reserved3: ::c_uint,
118-
pub shm_ctime: ::time_t,
119-
__glibc_reserved4: ::c_uint,
120-
pub shm_segsz: ::size_t,
121-
pub shm_cpid: ::pid_t,
122-
pub shm_lpid: ::pid_t,
123-
pub shm_nattch: ::shmatt_t,
124-
__glibc_reserved5: ::c_ulong,
125-
__glibc_reserved6: ::c_ulong,
126-
}
127-
128111
pub struct msqid_ds {
129112
pub msg_perm: ::ipc_perm,
130113
__glibc_reserved1: ::c_uint,
@@ -830,3 +813,13 @@ pub const SYS_memfd_secret: ::c_long = 447;
830813
pub const SYS_process_mrelease: ::c_long = 448;
831814
pub const SYS_futex_waitv: ::c_long = 449;
832815
pub const SYS_set_mempolicy_home_node: ::c_long = 450;
816+
817+
cfg_if! {
818+
if #[cfg(gnu_time64_abi)] {
819+
mod time64;
820+
pub use self::time64::*;
821+
} else {
822+
mod time32;
823+
pub use self::time32::*;
824+
}
825+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
s! {
2+
pub struct shmid_ds {
3+
pub shm_perm: ::ipc_perm,
4+
__glibc_reserved1: ::c_uint,
5+
pub shm_atime: ::time_t,
6+
__glibc_reserved2: ::c_uint,
7+
pub shm_dtime: ::time_t,
8+
__glibc_reserved3: ::c_uint,
9+
pub shm_ctime: ::time_t,
10+
__glibc_reserved4: ::c_uint,
11+
pub shm_segsz: ::size_t,
12+
pub shm_cpid: ::pid_t,
13+
pub shm_lpid: ::pid_t,
14+
pub shm_nattch: ::shmatt_t,
15+
__glibc_reserved5: ::c_ulong,
16+
__glibc_reserved6: ::c_ulong,
17+
}
18+
19+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
s! {
2+
pub struct shmid_ds {
3+
pub shm_perm: ::ipc_perm,
4+
pub shm_segsz: ::size_t,
5+
pub shm_atime: ::time_t,
6+
pub shm_dtime: ::time_t,
7+
pub shm_ctime: ::time_t,
8+
pub shm_cpid: ::pid_t,
9+
pub shm_lpid: ::pid_t,
10+
pub shm_nattch: ::shmatt_t,
11+
__glibc_reserved5: ::c_ulong,
12+
__glibc_reserved6: ::c_ulong,
13+
}
14+
}

src/unix/linux_like/linux/gnu/b32/x86/mod.rs

+3
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,13 @@ s! {
187187
pub shm_perm: ::ipc_perm,
188188
pub shm_segsz: ::size_t,
189189
pub shm_atime: ::time_t,
190+
#[cfg(not(gnu_time64_abi))]
190191
__unused1: ::c_ulong,
191192
pub shm_dtime: ::time_t,
193+
#[cfg(not(gnu_time64_abi))]
192194
__unused2: ::c_ulong,
193195
pub shm_ctime: ::time_t,
196+
#[cfg(not(gnu_time64_abi))]
194197
__unused3: ::c_ulong,
195198
pub shm_cpid: ::pid_t,
196199
pub shm_lpid: ::pid_t,

0 commit comments

Comments
 (0)