---

sfackler · sfackler · commit 73b2e1b10b8c · 2014-09-30T12:52:47.000-07:00
yaml --- r: 135935 b: refs/heads/try c: b4909f6 h: refs/heads/master i: 135933: 3a676ac 135931: ddf7cd6 135927: 46811e5 135919: e86aafb 135903: 5b9cc9e 135871: 8b09624 135807: f46174a 135679: 6eeed66 v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 8794107f74682607f368776cc8b78820629778e6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ae81c89f34f1ac2cdb596cf216612e94822a8466
-refs/heads/try: d9eac5d99c105d45d9c503abad9020bb3d8e0bad
+refs/heads/try: b4909f6eb713b51c73010e888053a1aed7b8fb64
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/librustdoc/flock.rs b/branches/try/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/branches/try/src/librustdoc/plugins.rs b/branches/try/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());

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,7 @@ mod imp {`
`84`	`84`	`pub static F_SETLKW: libc::c_int = 9;`
`85`	`85`	`}`
`86`	`86`
`87`		`- #[cfg(target_os = "macos")]`
`88`		`- #[cfg(target_os = "ios")]`
	`87`	`+ #[cfg(any(target_os = "macos", target_os = "ios"))]`
`89`	`88`	`mod os {`
`90`	`89`	`use libc;`
`91`	`90`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ fn libname(mut n: String) -> String {`
`85`	`85`	`n`
`86`	`86`	`}`
`87`	`87`
`88`		`-#[cfg(not(target_os="windows"), not(target_os="macos"))]`
	`88`	`+#[cfg(all(not(target_os="windows"), not(target_os="macos")))]`
`89`	`89`	`fn libname(n: String) -> String {`
`90`	`90`	`let mut i = String::from_str("lib");`
`91`	`91`	`i.push_str(n.as_slice());`