diff options
| author | bors <bors@rust-lang.org> | 2014-10-01 09:22:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-10-01 09:22:15 +0000 |
| commit | ff2616e847ddf913e007d715732b5669b0f22672 (patch) | |
| tree | e279e0568b2bc92c8f99d01a02a45a3a1fe040ee /src/libnative/lib.rs | |
| parent | 60e7317345f246a8169bbfe721473f693d54cade (diff) | |
| parent | b4909f6eb713b51c73010e888053a1aed7b8fb64 (diff) | |
| download | rust-ff2616e847ddf913e007d715732b5669b0f22672.tar.gz rust-ff2616e847ddf913e007d715732b5669b0f22672.zip | |
auto merge of #17630 : sfackler/rust/cfg-warnings, r=brson
Closes #17490
Diffstat (limited to 'src/libnative/lib.rs')
| -rw-r--r-- | src/libnative/lib.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libnative/lib.rs b/src/libnative/lib.rs index 06f89d38ca0..267ff3d2a81 100644 --- a/src/libnative/lib.rs +++ b/src/libnative/lib.rs @@ -77,10 +77,9 @@ pub use task::NativeTaskBuilder; pub mod io; pub mod task; -#[cfg(windows)] -#[cfg(android)] +#[cfg(any(windows, android))] static OS_DEFAULT_STACK_ESTIMATE: uint = 1 << 20; -#[cfg(unix, not(android))] +#[cfg(all(unix, not(android)))] static OS_DEFAULT_STACK_ESTIMATE: uint = 2 * (1 << 20); #[lang = "start"] |