Changeset 2756 for code/trunk/src/orxonox/gamestates/GSRoot.cc

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.

File:

• code/trunk/src/orxonox/gamestates/GSRoot.cc (modified) (1 diff)

code/trunk/src/orxonox/gamestates/GSRoot.cc

@@ -49 +49 @@
 #    define WIN32_LEAN_AND_MEAN
 #  endif
+#  define NOMINMAX // required to stop windows.h screwing up std::min definition
 #  include "windows.h"
-
-   //Get around Windows hackery
-#  ifdef max
-#    undef max
-#  endif
-#  ifdef min
-#    undef min
-#  endif
 #endif