Auto merge of #30270 - DiamondLovesYou:fix-30231, r=alexcrichton

bors · bors · commit 08a5b112ed7a · 2015-12-09T18:42:15.000Z
Closes #30231
diff --git a/src/libstd/sys/unix/fd.rs b/src/libstd/sys/unix/fd.rs
@@ -60,8 +60,8 @@ impl FileDesc {
     #[cfg(target_env = "newlib")]
     pub fn set_cloexec(&self) {
         unsafe {
-            let previous = libc::fnctl(self.fd, libc::F_GETFD);
-            let ret = libc::fnctl(self.fd, libc::F_SETFD, previous | libc::FD_CLOEXEC);
+            let previous = libc::fcntl(self.fd, libc::F_GETFD);
+            let ret = libc::fcntl(self.fd, libc::F_SETFD, previous | libc::FD_CLOEXEC);
             debug_assert_eq!(ret, 0);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -60,8 +60,8 @@ impl FileDesc {`
`60`	`60`	`#[cfg(target_env = "newlib")]`
`61`	`61`	`pub fn set_cloexec(&self) {`
`62`	`62`	`unsafe {`
`63`		`- let previous = libc::fnctl(self.fd, libc::F_GETFD);`
`64`		`- let ret = libc::fnctl(self.fd, libc::F_SETFD, previous \| libc::FD_CLOEXEC);`
	`63`	`+ let previous = libc::fcntl(self.fd, libc::F_GETFD);`
	`64`	`+ let ret = libc::fcntl(self.fd, libc::F_SETFD, previous \| libc::FD_CLOEXEC);`
`65`	`65`	`debug_assert_eq!(ret, 0);`
`66`	`66`	`}`
`67`	`67`	`}`