diff options
| author | bors <bors@rust-lang.org> | 2017-11-04 06:59:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-11-04 06:59:29 +0000 |
| commit | 9acc3331e187d329d29a70c788c44e25a79edf45 (patch) | |
| tree | edc666d4c7ea78ab757aa096965f361a4ea1cbae /src/libstd/sys | |
| parent | a4541525d5aa2cbf9c15e89cde513792e22a0318 (diff) | |
| parent | e3b25a59421d471d3c198bdbed60c8ba60e62376 (diff) | |
| download | rust-9acc3331e187d329d29a70c788c44e25a79edf45.tar.gz rust-9acc3331e187d329d29a70c788c44e25a79edf45.zip | |
Auto merge of #45755 - kennytm:rollup, r=kennytm
Rollup of 9 pull requests - Successful merges: #45548, #45610, #45639, #45669, #45681, #45718, #45722, #45739, #45746 - Failed merges:
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/windows/c.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/windows/c.rs b/src/libstd/sys/windows/c.rs index 39e00270233..6e0cccff001 100644 --- a/src/libstd/sys/windows/c.rs +++ b/src/libstd/sys/windows/c.rs @@ -1228,7 +1228,7 @@ compat_fn! { } } -#[cfg(target_env = "gnu")] +#[cfg(all(target_env = "gnu", feature = "backtrace"))] mod gnu { use super::*; @@ -1256,5 +1256,5 @@ mod gnu { } } -#[cfg(target_env = "gnu")] +#[cfg(all(target_env = "gnu", feature = "backtrace"))] pub use self::gnu::*; |