Cfg on only the target libc.

Author: DiamondLovesYou

src/liblibc/lib.rs

@@ -4441,7 +4441,7 @@ pub mod funcs {
                 pub fn execvp(c: *const c_char,
                               argv: *mut *const c_char) -> c_int;
                 pub fn fork() -> pid_t;
-                #[cfg(all(not(target_os = "nacl"), not(target_libc = "newlib")))]
+                #[cfg(not(target_libc = "newlib"))]
                 pub fn fpathconf(filedes: c_int, name: c_int) -> c_long;
                 pub fn getcwd(buf: *mut c_char, size: size_t) -> *mut c_char;
                 pub fn getegid() -> gid_t;

src/libnative/io/addrinfo.rs

@@ -87,7 +87,7 @@ impl GetAddrInfoRequest {
     }
 }
 
-#[cfg(all(not(target_os = "nacl"), not(target_libc = "newlib")))]
+#[cfg(not(target_libc = "newlib"))]
 extern "system" {
     fn getaddrinfo(node: *const c_char, service: *const c_char,
                    hints: *const libc::addrinfo,

src/libstd/sys/unix/fs.rs

@@ -256,11 +256,11 @@ pub fn chown(p: &Path, uid: int, gid: int) -> IoResult<()> {
 }
 
 pub fn readlink(p: &Path) -> IoResult<Path> {
-    #[cfg(all(not(target_os = "nacl"), not(target_libc = "newlib")))]
+    #[cfg(not(target_libc = "newlib"))]
     fn pathconf(p: *mut libc::c_char) -> i64 {
         unsafe { libc::pathconf(p, libc::_PC_NAME_MAX) as i64 }
     }
-    #[cfg(all(target_os = "nacl", target_libc = "newlib"))]
+    #[cfg(target_libc = "newlib")]
     fn pathconf(_: *mut libc::c_char) -> i64 {
         unsafe { libc::sysconf(libc::_PC_NAME_MAX) as i64 }
     }