From 99be617278cfcc398dd2cae1f23dd90fe2dacbed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 19 Feb 2013 21:07:24 +0100 Subject: [PATCH] Work-around preprocessor issues on Windows. I hate windows.h. --- src/Math/Matrix4.h | 5 +++++ src/SceneGraph/Camera3D.h | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Math/Matrix4.h b/src/Math/Matrix4.h index 4db6c9c71..8799c05cd 100644 --- a/src/Math/Matrix4.h +++ b/src/Math/Matrix4.h @@ -22,6 +22,11 @@ #include "Matrix.h" #include "Point3D.h" +#ifdef WIN32 /* I so HATE windows.h */ +#undef near +#undef far +#endif + namespace Magnum { namespace Math { /** diff --git a/src/SceneGraph/Camera3D.h b/src/SceneGraph/Camera3D.h index 4bd1cb309..91c8a6cd2 100644 --- a/src/SceneGraph/Camera3D.h +++ b/src/SceneGraph/Camera3D.h @@ -21,11 +21,6 @@ #include "AbstractCamera.h" -#ifdef WIN32 /* I so HATE windows.h */ -#undef near -#undef far -#endif - namespace Magnum { namespace SceneGraph { /**