TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 03:33:48 +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

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

@ -34,7 +34,7 @@
#define ioctl ioctlsocket
typedef int socklen_t;
typedef S32 socklen_t;
#elif defined ( TORQUE_OS_MAC )
@ -88,7 +88,7 @@ typedef in_addr IN_ADDR;
#define TORQUE_USE_WINSOCK
#define EINPROGRESS WSAEINPROGRESS
#define ioctl ioctlsocket
typedef int socklen_t;
typedef S32 socklen_t;
DWORD _getLastErrorAndClear()
{
@ -103,7 +103,7 @@ DWORD _getLastErrorAndClear()
#endif
#if defined(TORQUE_USE_WINSOCK)
static const char* strerror_wsa( int code )
static const char* strerror_wsa( S32 code )
{
switch( code )
{
@ -141,7 +141,7 @@ static const char* strerror_wsa( int code )
static Net::Error getLastError();
static S32 defaultPort = 28000;
static S32 netPort = 0;
static int udpSocket = InvalidSocket;
static S32 udpSocket = InvalidSocket;
ConnectionNotifyEvent Net::smConnectionNotify;
ConnectionAcceptedEvent Net::smConnectionAccept;
@ -445,7 +445,7 @@ void Net::closeConnectTo(NetSocket sock)
return;
// if this socket is in the list of polled sockets, remove it
for (int i = 0; i < gPolledSockets.size(); ++i)
for (S32 i = 0; i < gPolledSockets.size(); ++i)
{
if (gPolledSockets[i]->fd == sock)
{
@ -458,7 +458,7 @@ void Net::closeConnectTo(NetSocket sock)
closeSocket(sock);
}
Net::Error Net::sendtoSocket(NetSocket socket, const U8 *buffer, int bufferSize)
Net::Error Net::sendtoSocket(NetSocket socket, const U8 *buffer, S32 bufferSize)
{
if(Journal::IsPlaying())
{
@ -484,7 +484,7 @@ bool Net::openPort(S32 port, bool doBind)
// we turn off VDP in non-release builds because VDP does not support broadcast packets
// which are required for LAN queries (PC->Xbox connectivity). The wire protocol still
// uses the VDP packet structure, though.
int protocol = 0;
S32 protocol = 0;
bool useVDP = false;
#ifdef TORQUE_DISABLE_PC_CONNECTIVITY
// Xbox uses a VDP (voice/data protocol) socket for networking
@ -621,7 +621,7 @@ void Net::process()
sockaddr_in ipAddr;
NetSocket incoming = InvalidSocket;
char out_h_addr[1024];
int out_h_length = 0;
S32 out_h_length = 0;
RawData readBuff;
for (S32 i = 0; i < gPolledSockets.size();
@ -731,7 +731,7 @@ void Net::process()
if(::connect(currentSock->fd, (struct sockaddr *)&ipAddr,
sizeof(ipAddr)) == -1)
{
int errorCode;
S32 errorCode;
#if defined(TORQUE_USE_WINSOCK)
errorCode = WSAGetLastError();
if( errorCode == WSAEINPROGRESS || errorCode == WSAEWOULDBLOCK )
@ -790,7 +790,7 @@ void Net::process()
NetSocket Net::openSocket()
{
int retSocket;
S32 retSocket;
retSocket = socket(AF_INET, SOCK_STREAM, 0);
if(retSocket == InvalidSocket)
@ -835,7 +835,7 @@ NetSocket Net::accept(NetSocket acceptSocket, NetAddress *remoteAddress)
sockaddr_in socketAddress;
socklen_t addrLen = sizeof(socketAddress);
int retVal = ::accept(acceptSocket, (sockaddr *) &socketAddress, &addrLen);
S32 retVal = ::accept(acceptSocket, (sockaddr *) &socketAddress, &addrLen);
if(retVal != InvalidSocket)
{
IPSocketToNetAddress(&socketAddress, remoteAddress);