From b4909f6eb713b51c73010e888053a1aed7b8fb64 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Mon, 29 Sep 2014 00:29:09 -0700
Subject: [PATCH] Fix rustdoc

---
 src/librustdoc/flock.rs   | 3 +--
 src/librustdoc/plugins.rs | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/librustdoc/flock.rs b/src/librustdoc/flock.rs
index 8b72bd9e102..d1cc37497dc 100644
--- a/src/librustdoc/flock.rs
+++ b/src/librustdoc/flock.rs
@@ -84,8 +84,7 @@ mod imp {
         pub static F_SETLKW: libc::c_int = 9;
     }
 
-    #[cfg(target_os = "macos")]
-    #[cfg(target_os = "ios")]
+    #[cfg(any(target_os = "macos", target_os = "ios"))]
     mod os {
         use libc;
 
diff --git a/src/librustdoc/plugins.rs b/src/librustdoc/plugins.rs
index fe217a6d123..2b5595131d0 100644
--- a/src/librustdoc/plugins.rs
+++ b/src/librustdoc/plugins.rs
@@ -85,7 +85,7 @@ fn libname(mut n: String) -> String {
     n
 }
 
-#[cfg(not(target_os="windows"), not(target_os="macos"))]
+#[cfg(all(not(target_os="windows"), not(target_os="macos")))]
 fn libname(n: String) -> String {
     let mut i = String::from_str("lib");
     i.push_str(n.as_slice());