Skip to content

Commit cacf169

Browse files
snoggetgross35
authored andcommitted
gnu b32: Remove mips cfg conditionals in struct stat
Now that mips has its own copy of struct stat, remove all the cfg conditionals used to handle the difference between mips and everything else. Future support for _FILE_OFFSET_BITS=64 and _TIME_BITS=64 will be much easier when the mips differences does not have to be handled in the same conditionals. (backport <rust-lang#4276>) (cherry picked from commit a092eed)
1 parent c147b4c commit cacf169

File tree

2 files changed

+0
-48
lines changed

2 files changed

+0
-48
lines changed

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,50 +5,26 @@ pub type wchar_t = i32;
55

66
s! {
77
pub struct stat {
8-
#[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))]
9-
pub st_dev: crate::dev_t,
10-
#[cfg(any(target_arch = "mips", target_arch = "mips32r6"))]
118
pub st_dev: c_ulong,
129

13-
#[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))]
14-
__pad1: c_short,
15-
#[cfg(any(target_arch = "mips", target_arch = "mips32r6"))]
1610
st_pad1: [c_long; 3],
1711
pub st_ino: crate::ino_t,
1812
pub st_mode: crate::mode_t,
1913
pub st_nlink: crate::nlink_t,
2014
pub st_uid: crate::uid_t,
2115
pub st_gid: crate::gid_t,
22-
#[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))]
23-
pub st_rdev: crate::dev_t,
24-
#[cfg(any(target_arch = "mips", target_arch = "mips32r6"))]
2516
pub st_rdev: c_ulong,
26-
#[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))]
27-
__pad2: c_short,
28-
#[cfg(any(target_arch = "mips", target_arch = "mips32r6"))]
2917
st_pad2: [c_long; 2],
3018
pub st_size: off_t,
31-
#[cfg(any(target_arch = "mips", target_arch = "mips32r6"))]
3219
st_pad3: c_long,
33-
#[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))]
34-
pub st_blksize: crate::blksize_t,
35-
#[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))]
36-
pub st_blocks: crate::blkcnt_t,
3720
pub st_atime: crate::time_t,
3821
pub st_atime_nsec: c_long,
3922
pub st_mtime: crate::time_t,
4023
pub st_mtime_nsec: c_long,
4124
pub st_ctime: crate::time_t,
4225
pub st_ctime_nsec: c_long,
43-
#[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))]
44-
__unused4: c_long,
45-
#[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))]
46-
__unused5: c_long,
47-
#[cfg(any(target_arch = "mips", target_arch = "mips32r6"))]
4826
pub st_blksize: crate::blksize_t,
49-
#[cfg(any(target_arch = "mips", target_arch = "mips32r6"))]
5027
pub st_blocks: crate::blkcnt_t,
51-
#[cfg(any(target_arch = "mips", target_arch = "mips32r6"))]
5228
st_pad5: [c_long; 14],
5329
}
5430

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -44,51 +44,27 @@ cfg_if! {
4444
if #[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))] {
4545
s! {
4646
pub struct stat {
47-
#[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))]
4847
pub st_dev: crate::dev_t,
49-
#[cfg(any(target_arch = "mips", target_arch = "mips32r6"))]
50-
pub st_dev: c_ulong,
5148

52-
#[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))]
5349
__pad1: c_short,
54-
#[cfg(any(target_arch = "mips", target_arch = "mips32r6"))]
55-
st_pad1: [c_long; 3],
5650
pub st_ino: crate::ino_t,
5751
pub st_mode: crate::mode_t,
5852
pub st_nlink: crate::nlink_t,
5953
pub st_uid: crate::uid_t,
6054
pub st_gid: crate::gid_t,
61-
#[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))]
6255
pub st_rdev: crate::dev_t,
63-
#[cfg(any(target_arch = "mips", target_arch = "mips32r6"))]
64-
pub st_rdev: c_ulong,
65-
#[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))]
6656
__pad2: c_short,
67-
#[cfg(any(target_arch = "mips", target_arch = "mips32r6"))]
68-
st_pad2: [c_long; 2],
6957
pub st_size: off_t,
70-
#[cfg(any(target_arch = "mips", target_arch = "mips32r6"))]
71-
st_pad3: c_long,
72-
#[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))]
7358
pub st_blksize: crate::blksize_t,
74-
#[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))]
7559
pub st_blocks: crate::blkcnt_t,
7660
pub st_atime: crate::time_t,
7761
pub st_atime_nsec: c_long,
7862
pub st_mtime: crate::time_t,
7963
pub st_mtime_nsec: c_long,
8064
pub st_ctime: crate::time_t,
8165
pub st_ctime_nsec: c_long,
82-
#[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))]
8366
__unused4: c_long,
84-
#[cfg(not(any(target_arch = "mips", target_arch = "mips32r6")))]
8567
__unused5: c_long,
86-
#[cfg(any(target_arch = "mips", target_arch = "mips32r6"))]
87-
pub st_blksize: crate::blksize_t,
88-
#[cfg(any(target_arch = "mips", target_arch = "mips32r6"))]
89-
pub st_blocks: crate::blkcnt_t,
90-
#[cfg(any(target_arch = "mips", target_arch = "mips32r6"))]
91-
st_pad5: [c_long; 14],
9268
}
9369
}
9470
}

0 commit comments

Comments
 (0)