about summary refs log tree commit diff
path: root/src/libstd/os/linux
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-05-09 00:37:42 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-05-09 00:37:42 +0530
commit4c0f7fd6fcb45d26668d01d6434108ae2fc76580 (patch)
tree68081c3d3a73b3400ed5d54ca583b44db5bc61e7 /src/libstd/os/linux
parent8b8cb34747a76a55e1d29b7bf06b33cc7373bf9c (diff)
parent6c6b20031c80c8e30b8c4edc36f136b682534de6 (diff)
downloadrust-4c0f7fd6fcb45d26668d01d6434108ae2fc76580.tar.gz
rust-4c0f7fd6fcb45d26668d01d6434108ae2fc76580.zip
Rollup merge of #25140 - kevinmehall:mips, r=steveklabnik
Building with `--target=mipsel-unknown-linux-gnu` currently results in the following errors, fixed by this PR:

```
rustc: x86_64-unknown-linux-gnu/stage2/lib/rustlib/mipsel-unknown-linux-gnu/lib/libstd
/vol/rust/src/libstd/os/linux/raw.rs:76:21: 76:28 error: use of undeclared type name `c_ulong`
/vol/rust/src/libstd/os/linux/raw.rs:76         pub st_dev: c_ulong,
                                                            ^~~~~~~
/vol/rust/src/libstd/os/linux/raw.rs:83:22: 83:29 error: use of undeclared type name `c_ulong`
/vol/rust/src/libstd/os/linux/raw.rs:83         pub st_rdev: c_ulong,
                                                             ^~~~~~~
/vol/rust/src/libstd/sys/common/net2.rs:210:52: 210:70 error: unresolved name `libc::TCP_KEEPIDLE`
/vol/rust/src/libstd/sys/common/net2.rs:210         setsockopt(&self.inner, libc::IPPROTO_TCP, libc::TCP_KEEPIDLE,
```
Diffstat (limited to 'src/libstd/os/linux')
-rw-r--r--src/libstd/os/linux/raw.rs4
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;