about summary refs log tree commit diff
path: root/src/libnative
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-05-10 09:56:34 -0700
committerbors <bors@rust-lang.org>2014-05-10 09:56:34 -0700
commit1001635dc1be7ee7c42800e7e2e537a811280c8a (patch)
treed29a4504c7cb986152674b27a57529e8ebe431d9 /src/libnative
parente850316408bbe6254305cf4aa7c65381dc475192 (diff)
parent3f5e3af8387deb68e116228562062384d4b9cf65 (diff)
downloadrust-1001635dc1be7ee7c42800e7e2e537a811280c8a.tar.gz
rust-1001635dc1be7ee7c42800e7e2e537a811280c8a.zip
auto merge of #14073 : alexcrichton/rust/snapshots, r=huonw
Diffstat (limited to 'src/libnative')
-rw-r--r--src/libnative/io/net.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libnative/io/net.rs b/src/libnative/io/net.rs
index 63d57756e5d..218f8a4ef49 100644
--- a/src/libnative/io/net.rs
+++ b/src/libnative/io/net.rs
@@ -149,7 +149,7 @@ fn last_error() -> io::IoError {
 #[cfg(unix)]    unsafe fn close(sock: sock_t) { let _ = libc::close(sock); }
 
 fn sockname(fd: sock_t,
-            f: extern "system" unsafe fn(sock_t, *mut libc::sockaddr,
+            f: unsafe extern "system" fn(sock_t, *mut libc::sockaddr,
                                          *mut libc::socklen_t) -> libc::c_int)
     -> IoResult<ip::SocketAddr>
 {