From 92fb2243804e860e4b742aa835a42394f59858cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Thu, 21 Feb 2013 11:30:21 +0100
Subject: [PATCH] Partially revert "Work-around preprocessor issues on
 Windows."

Commit 99be617278cfcc398dd2cae1f23dd90fe2dacbed moved the #undef from
SceneGraph/Camera3D.h to Math/Matrix4.h, but it seems that it needs to
be in both places.
---
 src/Math/Matrix4.h        | 2 +-
 src/SceneGraph/Camera3D.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Math/Matrix4.h b/src/Math/Matrix4.h
index 757ebab21..937fba39e 100644
--- a/src/Math/Matrix4.h
+++ b/src/Math/Matrix4.h
@@ -22,7 +22,7 @@
 #include "Matrix.h"
 #include "Point3D.h"
 
-#ifdef WIN32 /* I so HATE windows.h */
+#ifdef _WIN32 /* I so HATE windows.h */
 #undef near
 #undef far
 #endif
diff --git a/src/SceneGraph/Camera3D.h b/src/SceneGraph/Camera3D.h
index d10124ac2..70a7258fe 100644
--- a/src/SceneGraph/Camera3D.h
+++ b/src/SceneGraph/Camera3D.h
@@ -21,6 +21,11 @@
 
 #include "AbstractCamera.h"
 
+#ifdef _WIN32 /* I so HATE windows.h */
+#undef near
+#undef far
+#endif
+
 namespace Magnum { namespace SceneGraph {
 
 /**