Skip to content

Commit 816b60e

Browse files
authored
Merge pull request #4519 from Gelbpunkt/musl-powerpc64-shmid-ds
musl: powerpc64: Decommonize definition of shmid_ds
2 parents 5698215 + 1ac2a19 commit 816b60e

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

src/unix/linux_like/linux/musl/b64/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ s! {
1717
__val: [c_ulong; 16],
1818
}
1919

20+
// PowerPC implementation is special, see the subfolder.
21+
#[cfg(not(target_arch = "powerpc64"))]
2022
pub struct shmid_ds {
2123
pub shm_perm: crate::ipc_perm,
2224
pub shm_segsz: size_t,

src/unix/linux_like/linux/musl/b64/powerpc64.rs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,18 @@ s! {
6161
__reserved: [c_long; 3],
6262
}
6363

64+
pub struct shmid_ds {
65+
pub shm_perm: crate::ipc_perm,
66+
pub shm_atime: crate::time_t,
67+
pub shm_dtime: crate::time_t,
68+
pub shm_ctime: crate::time_t,
69+
pub shm_segsz: size_t,
70+
pub shm_cpid: crate::pid_t,
71+
pub shm_lpid: crate::pid_t,
72+
pub shm_nattch: c_ulong,
73+
__unused: [c_ulong; 2],
74+
}
75+
6476
pub struct ipc_perm {
6577
#[cfg(musl_v1_2_3)]
6678
pub __key: crate::key_t,

0 commit comments

Comments
 (0)