diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-02-10 23:41:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-10 23:41:39 -0500 |
| commit | 0e6b3709298c7ccab445f7ae7bc8fa2d7f4404da (patch) | |
| tree | 1f8a2c887edba5d4b248abed2681abafe9666deb | |
| parent | 6866df669ce01c8a46dde9e7f21cf7a32a1bfcb4 (diff) | |
| parent | a8364acafb9bd7dff2aff6ca2007cbfd5463260c (diff) | |
| download | rust-0e6b3709298c7ccab445f7ae7bc8fa2d7f4404da.tar.gz rust-0e6b3709298c7ccab445f7ae7bc8fa2d7f4404da.zip | |
Rollup merge of #39724 - malbarbo:android, r=alexcrichton
Allow rustc data structures compile to android flock structure is defined in asm*/fcntl.h. This file on android is generated from the linux kernel source, so they are the same.
| -rw-r--r-- | src/librustc_data_structures/flock.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_data_structures/flock.rs b/src/librustc_data_structures/flock.rs index 33d71ba8626..26417e3ba7c 100644 --- a/src/librustc_data_structures/flock.rs +++ b/src/librustc_data_structures/flock.rs @@ -27,7 +27,7 @@ mod imp { use std::io; use libc; - #[cfg(target_os = "linux")] + #[cfg(any(target_os = "linux", target_os = "android"))] mod os { use libc; |