From 19d8ab8d5a311e502a55189d2a34858f8413fbef Mon Sep 17 00:00:00 2001 From: Carl-Anton Ingmarsson Date: Wed, 1 Jan 2014 19:04:35 +0100 Subject: [PATCH] libnative: Use [from|to]_be16 instead of bswap16 --- src/libnative/io/net.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/libnative/io/net.rs b/src/libnative/io/net.rs index 6736641c858..241a69ad4e6 100644 --- a/src/libnative/io/net.rs +++ b/src/libnative/io/net.rs @@ -26,15 +26,11 @@ use super::file::keep_going; #[cfg(windows)] pub type sock_t = libc::SOCKET; #[cfg(unix)] pub type sock_t = super::file::fd_t; -#[cfg(target_endian = "big")] pub fn htons(x: u16) -> u16 { x } -#[cfg(target_endian = "big")] pub fn ntohs(x: u16) -> u16 { x } -#[cfg(target_endian = "little")] pub fn htons(u: u16) -> u16 { - unsafe { intrinsics::bswap16(u as i16) as u16 } + intrinsics::to_be16(u as i16) as u16 } -#[cfg(target_endian = "little")] pub fn ntohs(u: u16) -> u16 { - unsafe { intrinsics::bswap16(u as i16) as u16 } + intrinsics::from_be16(u as i16) as u16 } enum InAddr {