diff options
| author | bors <bors@rust-lang.org> | 2015-05-08 20:39:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-08 20:39:08 +0000 |
| commit | b210aea1d446dcc9d05d0072c439575f9649d9f9 (patch) | |
| tree | 9e6135ba3a36f262aee4228236efa724130de1f3 /src/libstd | |
| parent | 7132092ce6e954eb58d490fa886d0865c5cfba38 (diff) | |
| parent | 55437b4a57d69e8411abb795ab02738e585932cd (diff) | |
| download | rust-b210aea1d446dcc9d05d0072c439575f9649d9f9.tar.gz rust-b210aea1d446dcc9d05d0072c439575f9649d9f9.zip | |
Auto merge of #25218 - Manishearth:rollup, r=Manishearth
- Successful merges: #24864, #25140, #25179, #25181, #25190, #25194, #25195, #25198, #25203, #25210, #25211, #25215 - Failed merges: #25200
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/os/linux/raw.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/os/linux/raw.rs b/src/libstd/os/linux/raw.rs index adce5f22ebc..9589f4cf099 100644 --- a/src/libstd/os/linux/raw.rs +++ b/src/libstd/os/linux/raw.rs @@ -60,8 +60,8 @@ mod arch { #[cfg(any(target_arch = "mips", target_arch = "mipsel"))] mod arch { - use super::{dev_t, mode_t}; - use os::raw::c_long; + use super::mode_t; + use os::raw::{c_long, c_ulong}; use os::unix::raw::{gid_t, uid_t}; pub type blkcnt_t = i32; |