From: Markus R. <rol...@us...> - 2007-02-23 19:25:54
|
Update of /cvsroot/simspark/simspark/spark/oxygen/simulationserver In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6697 Modified Files: Tag: WIN32 netclient.cpp Log Message: - use Socket::SocketDesc to hold a socket handle - fix select call for win32 Index: netclient.cpp =================================================================== RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/netclient.cpp,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** netclient.cpp 9 Feb 2007 20:11:56 -0000 1.2.2.1 --- netclient.cpp 23 Feb 2007 19:25:50 -0000 1.2.2.2 *************** *** 207,211 **** { // test for available data ! int fd = mSocket->getFD(); fd_set readfds; --- 207,211 ---- { // test for available data ! Socket::SocketDesc fd = mSocket->getFD(); fd_set readfds; *************** *** 217,221 **** time.tv_usec = 0; ! int rval = select(fd+1, &readfds, 0, 0, &time ); if (rval == 0) --- 217,227 ---- time.tv_usec = 0; ! #ifdef WIN32 ! int maxFd = 0; ! #else ! int maxFd = fd + 1; ! #endif ! ! int rval = select(maxFd, &readfds, 0, 0, &time ); if (rval == 0) |