Auto merge of #4713 - alexcrichton:fix-bsd, r=matklad

Fix compilation on more platforms
rust-lang · Nov 12, 2017 · e945a90 · e945a90
2 parents de48f75 + 51e5899
commit e945a90
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/cargo/core/shell.rs b/src/cargo/core/shell.rs
@@ -287,7 +287,7 @@ impl ColorChoice {
     }
 }
 
-#[cfg(unix)]
+#[cfg(any(target_os = "linux", target_os = "macos"))]
 mod imp {
     use std::mem;
 
@@ -308,6 +308,13 @@ mod imp {
     }
 }
 
+#[cfg(all(unix, not(any(target_os = "linux", target_os = "macos"))))]
+mod imp {
+    pub fn stderr_width() -> Option<usize> {
+        None
+    }
+}
+
 #[cfg(windows)]
 mod imp {
     use std::mem;