Changeset 2756 for code/trunk/src/util

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/util/Math.h (modified) (1 diff)

code/trunk/src/util/Math.h

@@ -51 +51 @@
 #include <OgreColourValue.h>
 
-//Get around Windows hackery
-#ifdef ORXONOX_PLATFORM_WINDOWS
-#  ifdef max
-#    undef max
-#  endif
-#  ifdef min
-#    undef min
-#  endif
+// Certain headers might define min and max macros
+#if defined(max) || defined(min) || defined(sgn) || defined(clamp) || defined(square) || defined(mod)
+#  error An inline math function was overridden by a macro
 #endif