Update of /cvsroot/simspark/simspark/spark/oxygen/simulationserver
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10347/oxygen/simulationserver
Modified Files:
Tag: WIN32
netclient.cpp netcontrol.cpp netmessage.cpp
Log Message:
Index: netclient.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/netclient.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** netclient.cpp 13 Dec 2005 21:26:40 -0000 1.2
--- netclient.cpp 9 Feb 2007 20:11:56 -0000 1.2.2.1
***************
*** 22,29 ****
#include "netclient.h"
#include <zeitgeist/logserver/logserver.h>
- #include <netinet/in.h>
#include <rcssnet/exception.hpp>
#include <cerrno>
using namespace oxygen;
using namespace zeitgeist;
--- 22,32 ----
#include "netclient.h"
#include <zeitgeist/logserver/logserver.h>
#include <rcssnet/exception.hpp>
#include <cerrno>
+ #ifndef WIN32
+ #include <netinet/in.h>
+ #endif
+
using namespace oxygen;
using namespace zeitgeist;
Index: netmessage.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/netmessage.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** netmessage.cpp 5 Dec 2005 21:21:18 -0000 1.1
--- netmessage.cpp 9 Feb 2007 20:11:56 -0000 1.1.2.1
***************
*** 20,24 ****
--- 20,27 ----
#include "netmessage.h"
#include "netbuffer.h"
+
+ #ifndef WIN32
#include <netinet/in.h>
+ #endif
using namespace oxygen;
***************
*** 38,42 ****
{
// prefix the message with it's payload length
! unsigned int len = htonl(msg.size());
string prefix((const char*)&len,sizeof(unsigned int));
msg = prefix + msg;
--- 41,45 ----
{
// prefix the message with it's payload length
! unsigned int len = htonl(static_cast<u_long>(msg.size()));
string prefix((const char*)&len,sizeof(unsigned int));
msg = prefix + msg;
Index: netcontrol.cpp
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/oxygen/simulationserver/netcontrol.cpp,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** netcontrol.cpp 5 Dec 2005 21:21:18 -0000 1.1
--- netcontrol.cpp 9 Feb 2007 20:11:56 -0000 1.1.2.1
***************
*** 21,25 ****
#include "netmessage.h"
#include <zeitgeist/logserver/logserver.h>
- #include <netinet/in.h>
#include <rcssnet/exception.hpp>
#include <rcssnet/tcpsocket.hpp>
--- 21,24 ----
***************
*** 28,31 ****
--- 27,34 ----
#include <cerrno>
+ #ifndef WIN32
+ #include <netinet/in.h>
+ #endif
+
using namespace rcss::net;
using namespace oxygen;
***************
*** 344,348 ****
}
! int fd = mSocket->getFD();
fd_set readfds;
--- 347,351 ----
}
! Socket::SocketDesc fd = mSocket->getFD();
fd_set readfds;
|
