Browse Source

Math,Trade: prevent collision with near/far defines in windows.h.

pull/168/head
Vladimír Vondruš 3 years ago
parent
commit
0150a5fcfd
  1. 5
      src/Magnum/Math/Frustum.h
  2. 5
      src/Magnum/Trade/CameraData.h

5
src/Magnum/Math/Frustum.h

@ -42,6 +42,11 @@
#include <Corrade/Containers/ArrayView.h> /** @todo remove when planes() is gone */
#endif
#ifdef CORRADE_TARGET_WINDOWS /* I so HATE windef.h */
#undef near
#undef far
#endif
namespace Magnum { namespace Math {
namespace Implementation {

5
src/Magnum/Trade/CameraData.h

@ -33,6 +33,11 @@
#include "Magnum/Math/Vector2.h"
#include "Magnum/Trade/visibility.h"
#ifdef CORRADE_TARGET_WINDOWS /* I so HATE windef.h */
#undef near
#undef far
#endif
namespace Magnum { namespace Trade {
/**

Loading…
Cancel
Save