TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'smally/platform_type_consistency' into platform-type-consistency

Browse source 
Conflicts:
	Engine/source/platform/platformCPUCount.cpp
This commit is contained in:
Daniel Buckmaster 2014-04-04 13:43:25 +11:00
commit 87d9e245b7
210 changed files with 896 additions and 896 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/platform/platformNetAsync.cpp
View file

@ -48,7 +48,7 @@ struct NetAsync::NameLookupRequest
NetSocket sock;
char remoteAddr[4096];
char out_h_addr[4096];
int out_h_length;
S32 out_h_length;
bool complete;
NameLookupRequest()
@ -140,7 +140,7 @@ void NetAsync::queueLookup(const char* remoteAddr, NetSocket socket)
{
// do we have it already?
unsigned int i = 0;
U32 i = 0;
for (i = 0; i < mLookupRequests.size(); ++i)
{
if (mLookupRequests[i].sock == socket)
@ -160,7 +160,7 @@ void NetAsync::queueLookup(const char* remoteAddr, NetSocket socket)
}
bool NetAsync::checkLookup(NetSocket socket, char* out_h_addr,
int* out_h_length, int out_h_addr_size)
S32* out_h_length, S32 out_h_addr_size)
{
bool found = false;