diff options
| author | Mike Buland <eichlan@xagasoft.com> | 2012-08-28 17:42:54 +0000 |
|---|---|---|
| committer | Mike Buland <eichlan@xagasoft.com> | 2012-08-28 17:42:54 +0000 |
| commit | 411cdf39fc2b961a970a0ae91b9059614251247e (patch) | |
| tree | 935afa56c11aef0fb769e63659970e7d033a99e8 /src/stable/server.cpp | |
| parent | fc5132d68ae9e6afdbd0b5a687ba81c88fc84826 (diff) | |
| download | libbu++-411cdf39fc2b961a970a0ae91b9059614251247e.tar.gz libbu++-411cdf39fc2b961a970a0ae91b9059614251247e.tar.bz2 libbu++-411cdf39fc2b961a970a0ae91b9059614251247e.tar.xz libbu++-411cdf39fc2b961a970a0ae91b9059614251247e.zip | |
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().
Diffstat (limited to '')
| -rw-r--r-- | src/stable/server.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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() | |||
| 29 | void Bu::Server::addPort( int nPort, int nPoolSize ) | 29 | void Bu::Server::addPort( int nPort, int nPoolSize ) |
| 30 | { | 30 | { |
| 31 | TcpServerSocket *s = new TcpServerSocket( nPort, nPoolSize ); | 31 | TcpServerSocket *s = new TcpServerSocket( nPort, nPoolSize ); |
| 32 | int nSocket = s->getSocket(); | 32 | socket_t nSocket = s->getSocket(); |
| 33 | FD_SET( nSocket, &fdActive ); | 33 | FD_SET( nSocket, &fdActive ); |
| 34 | hServers.insert( nSocket, s ); | 34 | hServers.insert( nSocket, s ); |
| 35 | } | 35 | } |
| @@ -37,7 +37,7 @@ void Bu::Server::addPort( int nPort, int nPoolSize ) | |||
| 37 | void Bu::Server::addPort( const String &sAddr, int nPort, int nPoolSize ) | 37 | void Bu::Server::addPort( const String &sAddr, int nPort, int nPoolSize ) |
| 38 | { | 38 | { |
| 39 | TcpServerSocket *s = new TcpServerSocket( sAddr, nPort, nPoolSize ); | 39 | TcpServerSocket *s = new TcpServerSocket( sAddr, nPort, nPoolSize ); |
| 40 | int nSocket = s->getSocket(); | 40 | socket_t nSocket = s->getSocket(); |
| 41 | FD_SET( nSocket, &fdActive ); | 41 | FD_SET( nSocket, &fdActive ); |
| 42 | hServers.insert( nSocket, s ); | 42 | hServers.insert( nSocket, s ); |
| 43 | } | 43 | } |
| @@ -131,7 +131,7 @@ void Bu::Server::scan() | |||
| 131 | tick(); | 131 | tick(); |
| 132 | } | 132 | } |
| 133 | 133 | ||
| 134 | void Bu::Server::addClient( int nSocket, int nPort ) | 134 | void Bu::Server::addClient( socket_t nSocket, int nPort ) |
| 135 | { | 135 | { |
| 136 | FD_SET( nSocket, &fdActive ); | 136 | FD_SET( nSocket, &fdActive ); |
| 137 | 137 | ||
| @@ -202,7 +202,7 @@ void Bu::Server::shutdown() | |||
| 202 | hClients.clear(); | 202 | hClients.clear(); |
| 203 | } | 203 | } |
| 204 | 204 | ||
| 205 | void Bu::Server::closeClient( int iSocket ) | 205 | void Bu::Server::closeClient( socket_t iSocket ) |
| 206 | { | 206 | { |
| 207 | Bu::Client *pClient = hClients.get( iSocket ); | 207 | Bu::Client *pClient = hClients.get( iSocket ); |
| 208 | onClosedConnection( pClient ); | 208 | onClosedConnection( pClient ); |
