Changeset 2756 for code/trunk/src/network

Timestamp:

Mar 8, 2009, 1:24:15 PM (16 years ago)

Author:

rgrieder

Message:

Minimising problems when including windows.h because it defines macros like "min" and "max" if not explicitly specified.
There are two headers we use that include windows.h: OgreWindowEventUtilities.h and enet.h. I had to tweak a little bit there as well.

Location:

code/trunk/src/network

Files:

• ClientConnection.h (modified) (1 diff)
• ClientInformation.h (modified) (1 diff)
• ConnectionManager.h (modified) (1 diff)
• PacketBuffer.h (modified) (1 diff)
• packet/DeleteObjects.cc (modified) (1 diff)
• packet/Packet.cc (modified) (1 diff)
• packet/Packet.h (modified) (1 diff)

code/trunk/src/network/ClientConnection.h

@@ -44 +44 @@
 
 #include <string>
+#ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
+#define NOMINMAX // required to stop windows.h screwing up std::min definition
 #include <enet/enet.h>
 #include <boost/thread/recursive_mutex.hpp>

code/trunk/src/network/ClientInformation.h

@@ -43 +43 @@
 #include "NetworkPrereqs.h"
 
+#ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
+#define NOMINMAX // required to stop windows.h screwing up std::min definition
 #include <enet/enet.h>
 #include <boost/thread/recursive_mutex.hpp>

code/trunk/src/network/ConnectionManager.h

@@ -46 +46 @@
 #include <map>
 // enet library for networking support
+#ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
+#define NOMINMAX // required to stop windows.h screwing up std::min definition
 #include <enet/enet.h>
 #include <boost/thread/recursive_mutex.hpp>

code/trunk/src/network/PacketBuffer.h

@@ -44 +44 @@
 #include "NetworkPrereqs.h"
 
+#ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
+#define NOMINMAX // required to stop windows.h screwing up std::min definition
 #include <enet/enet.h>
 #include <boost/thread/recursive_mutex.hpp>

code/trunk/src/network/packet/DeleteObjects.cc

@@ -29 +29 @@
 
 #include "DeleteObjects.h"
+#ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
+#define NOMINMAX // required to stop windows.h screwing up std::min definition
 #include <enet/enet.h>
 #include "network/synchronisable/Synchronisable.h"

code/trunk/src/network/packet/Packet.cc

@@ -31 +31 @@
 
 #include <cassert>
+#ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
+#define NOMINMAX // required to stop windows.h screwing up std::min definition
 #include <enet/enet.h>
 #include <boost/bind.hpp>

code/trunk/src/network/packet/Packet.h

@@ -32 +32 @@
 
 #include <map>
+#ifndef WIN32_LEAN_AND_MEAN
+#  define WIN32_LEAN_AND_MEAN
+#endif
+#define NOMINMAX // required to stop windows.h screwing up std::min definition
 #include <enet/enet.h>
 #include <boost/thread/recursive_mutex.hpp>