diff options
| author | bors <bors@rust-lang.org> | 2016-02-18 16:29:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-18 16:29:55 +0000 |
| commit | 6b076c2daa36d80c103812c1775cf099ea8ef0bf (patch) | |
| tree | 94e22f6e099f6784b9166b0b1629117df1a3fcca /src/libstd/sys/unix/stack_overflow.rs | |
| parent | 8e2a577804b32b6d203abe61e0cdf3a88837d228 (diff) | |
| parent | 90afb85a0c6c51a82933094f79ab0027915148c2 (diff) | |
| download | rust-6b076c2daa36d80c103812c1775cf099ea8ef0bf.tar.gz rust-6b076c2daa36d80c103812c1775cf099ea8ef0bf.zip | |
Auto merge of #31734 - aliclark:bsd-stat-fixes, r=alexcrichton
In https://github.com/rust-lang/rust/issues/25155 the os::freebsd::raw stat was split for the x86 vs. x86-64 cases, which appears to have been done to implement the padding on the end of struct stat for the x86 case (the struct is otherwise the same notwistanding the size of long). This PR de-duplicates the struct using #[cfg(target_arch = "x86")] for the __unused field, which also fixes the definitions which had sinced changed with the LFS work d088b671872f1df6993ccca6fa6139ebed0a8cf3. Also changed definitions to c_long for dragonfly and freebsd where appropriate. Also removes some unused imports that the compiler was complaining about. dragonfly's long time_t: https://gitweb.dragonflybsd.org/dragonfly.git/blob/a2a57c243ff8016578bc559f8603fb25bbcf1768:/lib/libstand/machine/stdint.h freebsd's long time_t: https://svnweb.freebsd.org/base/release/10.1.0/sys/x86/include/_types.h?view=markup https://github.com/rust-lang/rust/blob/d088b671872f1df6993ccca6fa6139ebed0a8cf3/src/liblibc/lib.rs#L980 freebsd's padding for i686 stat: https://svnweb.freebsd.org/base/release/10.1.0/sys/sys/stat.h?view=markup#l139 https://github.com/rust-lang/rust/blob/d088b671872f1df6993ccca6fa6139ebed0a8cf3/src/liblibc/lib.rs#L1038
Diffstat (limited to 'src/libstd/sys/unix/stack_overflow.rs')
0 files changed, 0 insertions, 0 deletions