From 0c6862e3e6469ade34ed6d994ffa92e2bcc90ff3 Mon Sep 17 00:00:00 2001
From: "Alexander \"Ace\" Olofsson" <ace@haxalot.com>
Date: Fri, 13 Apr 2012 15:09:38 +0200
Subject: [PATCH] Undefining some windows defines

---
 apps/openmw/mwmechanics/drawstate.hpp    | 2 ++
 apps/openmw/mwrender/terrainmaterial.cpp | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/apps/openmw/mwmechanics/drawstate.hpp b/apps/openmw/mwmechanics/drawstate.hpp
index ded25f8d5..772086d90 100644
--- a/apps/openmw/mwmechanics/drawstate.hpp
+++ b/apps/openmw/mwmechanics/drawstate.hpp
@@ -1,6 +1,8 @@
 #ifndef GAME_MWMECHANICS_DRAWSTATE_H
 #define GAME_MWMECHANICS_DRAWSTATE_H
 
+#undef DrawState
+
 enum DrawState 
 {
     DrawState_Weapon = 0,
diff --git a/apps/openmw/mwrender/terrainmaterial.cpp b/apps/openmw/mwrender/terrainmaterial.cpp
index 57bea5388..331bb47e3 100644
--- a/apps/openmw/mwrender/terrainmaterial.cpp
+++ b/apps/openmw/mwrender/terrainmaterial.cpp
@@ -39,6 +39,8 @@ THE SOFTWARE.
 #include <components/settings/settings.hpp>
 #include "renderingmanager.hpp"
 
+#undef far
+
 namespace Ogre
 {
 	//---------------------------------------------------------------------