---

yaml
---
r: 13363
b: refs/heads/master
c: 95b9d53
h: refs/heads/master
i:
  13361: 781c84b
  13359: afaa180
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: fd85239119ffba1c57a493603d63deed9be60521
+refs/heads/master: 95b9d538b8bda04e222c95d478b97c19d77bb5c6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/cmath.rs

@@ -48,12 +48,10 @@ native mod c_double {
     pure fn frexp(n: c_double, &value: c_int) -> c_double;
     pure fn hypot(x: c_double, y: c_double) -> c_double;
     pure fn ldexp(x: c_double, n: c_int) -> c_double;
-    #[cfg(target_os = "linux")]
-    #[cfg(target_os = "macos")]
-    #[cfg(target_os = "freebsd")]
+    #[cfg(unix)]
     #[link_name="lgamma_r"] pure fn lgamma(n: c_double,
                                            &sign: c_int) -> c_double;
-    #[cfg(target_os = "win32")]
+    #[cfg(windows)]
     #[link_name="__lgamma_r"] pure fn lgamma(n: c_double,
                                              &sign: c_int) -> c_double;
     // renamed: log is a reserved keyword; ln seems more natural, too
@@ -131,13 +129,11 @@ native mod c_float {
     #[link_name="hypotf"] pure fn hypot(x: c_float, y: c_float) -> c_float;
     #[link_name="ldexpf"] pure fn ldexp(x: c_float, n: c_int) -> c_float;
 
-    #[cfg(target_os="linux")]
-    #[cfg(target_os="macos")]
-    #[cfg(target_os="freebsd")]
+    #[cfg(unix)]
     #[link_name="lgammaf_r"] pure fn lgamma(n: c_float,
                                             &sign: c_int) -> c_float;
 
-    #[cfg(target_os="win32")]
+    #[cfg(windows)]
     #[link_name="__lgammaf_r"] pure fn lgamma(n: c_float,
                                               &sign: c_int) -> c_float;
 

trunk/src/libcore/comm.rs

@@ -420,15 +420,15 @@ fn test_recv_chan() {
 
 #[test]
 #[should_fail]
-#[ignore(cfg(target_os = "win32"))]
+#[ignore(cfg(windows))]
 fn test_recv_chan_dead() {
     let ch = chan(port());
     send(ch, "flower");
     recv_chan(ch);
 }
 
 #[test]
-#[ignore(cfg(target_os = "win32"))]
+#[ignore(cfg(windows))]
 fn test_recv_chan_wrong_task() {
     let po = port();
     let ch = chan(po);
@@ -464,7 +464,7 @@ fn test_listen() {
 }
 
 #[test]
-#[ignore(cfg(target_os="win32"))]
+#[ignore(cfg(windows))]
 fn test_port_detach_fail() {
     iter::repeat(100u) {||
         let builder = task::builder();

trunk/src/libcore/io.rs

@@ -398,12 +398,10 @@ fn fd_writer(fd: fd_t, cleanup: bool) -> writer {
 fn mk_file_writer(path: str, flags: [fileflag])
     -> result<writer, str> {
 
-    #[cfg(target_os = "win32")]
+    #[cfg(windows)]
     fn wb() -> c_int { (O_WRONLY | O_BINARY) as c_int }
 
-    #[cfg(target_os = "linux")]
-    #[cfg(target_os = "macos")]
-    #[cfg(target_os = "freebsd")]
+    #[cfg(unix)]
     fn wb() -> c_int { O_WRONLY as c_int }
 
     let mut fflags: c_int = wb();

trunk/src/libcore/iter.rs

@@ -229,7 +229,7 @@ fn test_min() {
 
 #[test]
 #[should_fail]
-#[ignore(cfg(target_os = "win32"))]
+#[ignore(cfg(windows))]
 fn test_min_empty() {
     min::<int, [int]>([]);
 }
@@ -241,7 +241,7 @@ fn test_max() {
 
 #[test]
 #[should_fail]
-#[ignore(cfg(target_os = "win32"))]
+#[ignore(cfg(windows))]
 fn test_max_empty() {
     max::<int, [int]>([]);
 }