From 411cdf39fc2b961a970a0ae91b9059614251247e Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Tue, 28 Aug 2012 17:42:54 +0000 Subject: Loads of win32 compilation issues fixed. Most are fairly minor unsigned/signed mismatches because of socket handles, but there were also some order-of-definition issues that were fixed in the FD_SETSIZE definition code. Fixed a few things that just never worked on windows, like Bu::Thread::yield(). --- src/stable/server.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/stable/server.cpp') diff --git a/src/stable/server.cpp b/src/stable/server.cpp index e4769a5..39ff7bb 100644 --- a/src/stable/server.cpp +++ b/src/stable/server.cpp @@ -29,7 +29,7 @@ Bu::Server::~Server() void Bu::Server::addPort( int nPort, int nPoolSize ) { TcpServerSocket *s = new TcpServerSocket( nPort, nPoolSize ); - int nSocket = s->getSocket(); + socket_t nSocket = s->getSocket(); FD_SET( nSocket, &fdActive ); hServers.insert( nSocket, s ); } @@ -37,7 +37,7 @@ void Bu::Server::addPort( int nPort, int nPoolSize ) void Bu::Server::addPort( const String &sAddr, int nPort, int nPoolSize ) { TcpServerSocket *s = new TcpServerSocket( sAddr, nPort, nPoolSize ); - int nSocket = s->getSocket(); + socket_t nSocket = s->getSocket(); FD_SET( nSocket, &fdActive ); hServers.insert( nSocket, s ); } @@ -131,7 +131,7 @@ void Bu::Server::scan() tick(); } -void Bu::Server::addClient( int nSocket, int nPort ) +void Bu::Server::addClient( socket_t nSocket, int nPort ) { FD_SET( nSocket, &fdActive ); @@ -202,7 +202,7 @@ void Bu::Server::shutdown() hClients.clear(); } -void Bu::Server::closeClient( int iSocket ) +void Bu::Server::closeClient( socket_t iSocket ) { Bu::Client *pClient = hClients.get( iSocket ); onClosedConnection( pClient ); -- cgit v1.2.3