TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 16:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1886 from Azaezel/socketSigShenanigans

Browse source 
looks like getsockname needs a slightly different signature for crossplat support
This commit is contained in:
Areloch 2016-12-28 23:59:04 -06:00 • committed by GitHub
commit 46d81f5d26
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/platform/platformNet.cpp
View file

@ -368,7 +368,7 @@ namespace PlatformNetState
if (requiredFamily == AF_INET) if (requiredFamily == AF_INET)
{ {
sockaddr_in ipAddr; sockaddr_in ipAddr;
int len = sizeof(ipAddr); socklen_t len = sizeof(ipAddr);
if (getsockname(socketFd, (struct sockaddr*)&ipAddr, &len) >= 0) if (getsockname(socketFd, (struct sockaddr*)&ipAddr, &len) >= 0)
{ {
IPSocketToNetAddress(&ipAddr, outAddress); IPSocketToNetAddress(&ipAddr, outAddress);
@ -382,7 +382,7 @@ namespace PlatformNetState
else if (requiredFamily == AF_INET6) else if (requiredFamily == AF_INET6)
{ {
sockaddr_in6 ipAddr; sockaddr_in6 ipAddr;
int len = sizeof(ipAddr); socklen_t len = sizeof(ipAddr);
if (getsockname(socketFd, (struct sockaddr*)&ipAddr, &len) >= 0) if (getsockname(socketFd, (struct sockaddr*)&ipAddr, &len) >= 0)
{ {
IPSocket6ToNetAddress(&ipAddr, outAddress); IPSocket6ToNetAddress(&ipAddr, outAddress);