Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 3214 for code/trunk/src/util


Ignore:
Timestamp:
Jun 23, 2009, 6:02:25 PM (16 years ago)
Author:
scheusso
Message:

merged netp5 back to trunk

Location:
code/trunk/src/util
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • code/trunk/src/util/Clipboard.cc

    r3196 r3214  
    4242/////////////
    4343
     44#ifndef WIN32_LEAN_AND_MEAN
     45#  define WIN32_LEAN_AND_MEAN
     46#endif
    4447#include <windows.h>
     48#undef min
     49#undef max
    4550#include "Debug.h"
    4651

  • code/trunk/src/util/Math.h

    r3196 r3214  
    4747#include <OgreColourValue.h>
    4848
    49 // Certain headers might define min and max macros
    50 #if defined(max) || defined(min) || defined(sgn) || defined(clamp) || defined(square) || defined(mod)
    51 #  error An inline math function was overridden by a macro
    52 #endif
     49// Certain headers might define unwanted macros...
     50#undef max
     51#undef min
     52#undef sgn
     53#undef clamp
     54#undef sqrt
     55#undef square
     56#undef mod
     57#undef rnd
    5358
    5459namespace orxonox

  • code/trunk/src/util/Sleep.cc

    r3196 r3214  
    3737
    3838#ifdef ORXONOX_PLATFORM_WINDOWS
     39#ifndef WIN32_LEAN_AND_MEAN
     40#  define WIN32_LEAN_AND_MEAN
     41#endif
    3942#include <windows.h>
     43#undef min
     44#undef max
    4045
    4146namespace orxonox
Note: See TracChangeset for help on using the changeset viewer.