actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

attempt to fix build

Browse Source
This commit is contained in:
Colby Klein
2017-06-16 12:14:21 -07:00
parent a3eab2e7ab
commit f537e55d88
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NetworkSyncManager.cpp
+4 -4
View File
@@ -867,7 +867,7 @@ uint16_t PacketFunctions::Read2()
uint16_t Temp; uint16_t Temp;
memcpy( &Temp, Data + Position,2 ); memcpy( &Temp, Data + Position,2 );
Position+=2; Position+=2;
return EzSockets::ntohs(Temp); return EzSockets::sm_ntohs(Temp);
} }
uint32_t PacketFunctions::Read4() uint32_t PacketFunctions::Read4()
@@ -878,7 +878,7 @@ uint32_t PacketFunctions::Read4()
uint32_t Temp; uint32_t Temp;
memcpy( &Temp, Data + Position,4 ); memcpy( &Temp, Data + Position,4 );
Position+=4; Position+=4;
return EzSockets::ntohl(Temp); return EzSockets::sm_ntohl(Temp);
} }
RString PacketFunctions::ReadNT() RString PacketFunctions::ReadNT()
@@ -905,7 +905,7 @@ void PacketFunctions::Write2(uint16_t data)
{ {
if (Position>=NETMAXBUFFERSIZE-1) if (Position>=NETMAXBUFFERSIZE-1)
return; return;
data = EzSockets::htons(data); data = EzSockets::sm_htons(data);
memcpy( &Data[Position], &data, 2 ); memcpy( &Data[Position], &data, 2 );
Position+=2; Position+=2;
} }
@@ -915,7 +915,7 @@ void PacketFunctions::Write4(uint32_t data)
if (Position>=NETMAXBUFFERSIZE-3) if (Position>=NETMAXBUFFERSIZE-3)
return ; return ;
data = EzSockets::htonl(data); data = EzSockets::sm_htonl(data);
memcpy( &Data[Position], &data, 4 ); memcpy( &Data[Position], &data, 4 );
Position+=4; Position+=4;
} }
src/ezsockets.cpp
+4 -4
View File
@@ -90,22 +90,22 @@ namespace
}; };
} }
uint32_t EzSockets::ntohl(uint32_t in) uint32_t EzSockets::sm_ntohl(uint32_t in)
{ {
return ::ntohl(in); return ::ntohl(in);
} }
uint16_t EzSockets::ntohs(uint16_t in) uint16_t EzSockets::sm_ntohs(uint16_t in)
{ {
return ::ntohs(in); return ::ntohs(in);
} }
uint32_t EzSockets::htonl(uint32_t in) uint32_t EzSockets::sm_htonl(uint32_t in)
{ {
return ::htonl(in); return ::htonl(in);
} }
uint16_t EzSockets::htons(uint16_t in) { uint16_t EzSockets::sm_htons(uint16_t in) {
return ::htons(in); return ::htons(in);
} }
src/ezsockets.h
+4 -4
View File
@@ -127,10 +127,10 @@ public:
RString address; RString address;
// Wrapped here so we don't have to leak winapi everywhere... // Wrapped here so we don't have to leak winapi everywhere...
static uint32_t ntohl(uint32_t); static uint32_t sm_ntohl(uint32_t);
static uint16_t ntohs(uint16_t); static uint16_t sm_ntohs(uint16_t);
static uint32_t htonl(uint32_t); static uint32_t sm_htonl(uint32_t);
static uint16_t htons(uint16_t); static uint16_t sm_htons(uint16_t);
private: private: