diff options
Diffstat (limited to 'src/libnative/io/net.rs')
| -rw-r--r-- | src/libnative/io/net.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libnative/io/net.rs b/src/libnative/io/net.rs index 32cd6337f99..9042353c50a 100644 --- a/src/libnative/io/net.rs +++ b/src/libnative/io/net.rs @@ -68,7 +68,7 @@ fn ip_to_inaddr(ip: ip::IpAddr) -> InAddr { fn addr_to_sockaddr(addr: ip::SocketAddr) -> (libc::sockaddr_storage, uint) { unsafe { - let storage: libc::sockaddr_storage = intrinsics::init(); + let storage: libc::sockaddr_storage = mem::init(); let len = match ip_to_inaddr(addr.ip) { InAddr(inaddr) => { let storage: *mut libc::sockaddr_in = cast::transmute(&storage); @@ -138,7 +138,7 @@ fn sockname(fd: sock_t, *mut libc::socklen_t) -> libc::c_int) -> IoResult<ip::SocketAddr> { - let mut storage: libc::sockaddr_storage = unsafe { intrinsics::init() }; + let mut storage: libc::sockaddr_storage = unsafe { mem::init() }; let mut len = mem::size_of::<libc::sockaddr_storage>() as libc::socklen_t; unsafe { let storage = &mut storage as *mut libc::sockaddr_storage; @@ -225,7 +225,7 @@ pub fn init() { LOCK.lock(); if !INITIALIZED { - let mut data: WSADATA = intrinsics::init(); + let mut data: WSADATA = mem::init(); let ret = WSAStartup(0x202, // version 2.2 &mut data); assert_eq!(ret, 0); @@ -438,7 +438,7 @@ impl TcpAcceptor { pub fn native_accept(&mut self) -> IoResult<TcpStream> { unsafe { - let mut storage: libc::sockaddr_storage = intrinsics::init(); + let mut storage: libc::sockaddr_storage = mem::init(); let storagep = &mut storage as *mut libc::sockaddr_storage; let size = mem::size_of::<libc::sockaddr_storage>(); let mut size = size as libc::socklen_t; @@ -543,7 +543,7 @@ impl rtio::RtioSocket for UdpSocket { impl rtio::RtioUdpSocket for UdpSocket { fn recvfrom(&mut self, buf: &mut [u8]) -> IoResult<(uint, ip::SocketAddr)> { unsafe { - let mut storage: libc::sockaddr_storage = intrinsics::init(); + let mut storage: libc::sockaddr_storage = mem::init(); let storagep = &mut storage as *mut libc::sockaddr_storage; let mut addrlen: libc::socklen_t = mem::size_of::<libc::sockaddr_storage>() as libc::socklen_t; |