Skip to content

Commit

Permalink
Rollup merge of rust-lang#22792 - semarie:openbsd-unbreak-nacl, r=ale…
Browse files Browse the repository at this point in the history
…xcrichton

 The recent commit on liblibc for nacl break the compilation for OpenBSD (and Bitrig too, I think).

The problem is `ino_t` come from another block too now. This patch remove the extra declaration.

```
.../src/liblibc/lib.rs:98:9: 98:37 error: a type named `ino_t` has already been imported in this module [E0251]
.../src/liblibc/lib.rs:98 pub use types::os::arch::posix01::*;
                                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
error: aborting due to previous error
```

@dhuseby do you have this problem too ? and if yes, does this patch correct it ?
  • Loading branch information
Manishearth committed Feb 25, 2015
2 parents 3a49c3b + 91e00f3 commit 1c97ac3
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion src/liblibc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1362,7 +1362,6 @@ pub mod types {
use types::os::arch::c95::{c_long};
pub type off_t = i64;
pub type dev_t = i32;
pub type ino_t = u64;
pub type pid_t = i32;
pub type uid_t = u32;
pub type gid_t = u32;
Expand Down

0 comments on commit 1c97ac3

Please sign in to comment.