diff --git a/src/NetworkSyncManager.cpp b/src/NetworkSyncManager.cpp index e9442eca26..34dd2d6742 100644 --- a/src/NetworkSyncManager.cpp +++ b/src/NetworkSyncManager.cpp @@ -867,7 +867,7 @@ uint16_t PacketFunctions::Read2() uint16_t Temp; memcpy( &Temp, Data + Position,2 ); Position+=2; - return EzSockets::ntohs(Temp); + return EzSockets::sm_ntohs(Temp); } uint32_t PacketFunctions::Read4() @@ -878,7 +878,7 @@ uint32_t PacketFunctions::Read4() uint32_t Temp; memcpy( &Temp, Data + Position,4 ); Position+=4; - return EzSockets::ntohl(Temp); + return EzSockets::sm_ntohl(Temp); } RString PacketFunctions::ReadNT() @@ -905,7 +905,7 @@ void PacketFunctions::Write2(uint16_t data) { if (Position>=NETMAXBUFFERSIZE-1) return; - data = EzSockets::htons(data); + data = EzSockets::sm_htons(data); memcpy( &Data[Position], &data, 2 ); Position+=2; } @@ -915,7 +915,7 @@ void PacketFunctions::Write4(uint32_t data) if (Position>=NETMAXBUFFERSIZE-3) return ; - data = EzSockets::htonl(data); + data = EzSockets::sm_htonl(data); memcpy( &Data[Position], &data, 4 ); Position+=4; } diff --git a/src/ezsockets.cpp b/src/ezsockets.cpp index 689da60c7e..d68e4864ad 100644 --- a/src/ezsockets.cpp +++ b/src/ezsockets.cpp @@ -90,22 +90,22 @@ namespace }; } -uint32_t EzSockets::ntohl(uint32_t in) +uint32_t EzSockets::sm_ntohl(uint32_t in) { return ::ntohl(in); } -uint16_t EzSockets::ntohs(uint16_t in) +uint16_t EzSockets::sm_ntohs(uint16_t in) { return ::ntohs(in); } -uint32_t EzSockets::htonl(uint32_t in) +uint32_t EzSockets::sm_htonl(uint32_t in) { return ::htonl(in); } -uint16_t EzSockets::htons(uint16_t in) { +uint16_t EzSockets::sm_htons(uint16_t in) { return ::htons(in); } diff --git a/src/ezsockets.h b/src/ezsockets.h index a2aa1b26db..57d33f53e2 100644 --- a/src/ezsockets.h +++ b/src/ezsockets.h @@ -127,10 +127,10 @@ public: RString address; // Wrapped here so we don't have to leak winapi everywhere... - static uint32_t ntohl(uint32_t); - static uint16_t ntohs(uint16_t); - static uint32_t htonl(uint32_t); - static uint16_t htons(uint16_t); + static uint32_t sm_ntohl(uint32_t); + static uint16_t sm_ntohs(uint16_t); + static uint32_t sm_htonl(uint32_t); + static uint16_t sm_htons(uint16_t); private: