---

sfackler · sfackler · commit 6661c6386086 · 2014-09-30T12:52:47.000-07:00
yaml --- r: 155572 b: refs/heads/try2 c: b4909f6 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: d9eac5d99c105d45d9c503abad9020bb3d8e0bad
+refs/heads/try2: b4909f6eb713b51c73010e888053a1aed7b8fb64
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/librustdoc/flock.rs b/branches/try2/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/try2/src/librustdoc/plugins.rs b/branches/try2/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());`