Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine
Former-commit-id: 6f80ecce36f54f38e21b284322b78da21e2ad7e8 [formerly cc1739a84c500d411d75142ee040c30e014528a8] [formerly f6a9fd8e4e695574a2e102641fb35706f5c88c80 [formerly b8bef5e10b7fb0698532db1e532ec212d56f004f]] Former-commit-id: b781bde9bb61d77ce5b93b835aa5968bcbe564a9 [formerly 188733c992ea6c1c9f91ab7a151f9e4f67a581d4] Former-commit-id: 1fa486c6257f066aff4810f3ae33e0f67f397807
This commit is contained in:
commit
cd94520f26
|
|
@ -398,7 +398,7 @@ namespace Nz
|
|||
return IpAddressImpl::FromSockAddr(reinterpret_cast<sockaddr*>(nameBuffer.data()));
|
||||
}
|
||||
|
||||
int SocketImpl::Poll(PollSocket* fdarray, unsigned long nfds, int timeout, SocketError* error)
|
||||
int SocketImpl::Poll(PollSocket* fdarray, std::size_t nfds, int timeout, SocketError* error)
|
||||
{
|
||||
NazaraAssert(fdarray && nfds > 0, "Invalid fdarray");
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue