From fd758bacd3d2773906416b3dd12f09563d1054d2 Mon Sep 17 00:00:00 2001
From: cc9cii <cc9c@iinet.net.au>
Date: Fri, 6 Jun 2014 19:58:05 +1000
Subject: [PATCH] Remove #ifdef guards.

---
 extern/oics/ICSPrerequisites.h      | 7 ++-----
 extern/sdl4ogre/sdlinputwrapper.hpp | 3 ---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/extern/oics/ICSPrerequisites.h b/extern/oics/ICSPrerequisites.h
index 5fe58a63df..6e6cd814ba 100644
--- a/extern/oics/ICSPrerequisites.h
+++ b/extern/oics/ICSPrerequisites.h
@@ -36,10 +36,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <map>
 #include <list>
 #include <limits>
-
-#if defined(_WIN32) && _MSC_VER >= 1800
-#include <algorithm> /* std::min and std::max */
-#endif
+#include <algorithm> /* std::min and std::max for MSVC 2013 */
 
 #include "tinyxml.h"
 
@@ -94,7 +91,7 @@ namespace ICS
 
 	// from http://www.cplusplus.com/forum/articles/9645/
 	template <typename T>
-	T FromString ( const std::string &Text )//Text not by const reference so that the function can be used with a 
+	T FromString ( const std::string &Text )//Text not by const reference so that the function can be used with a
 	{											//character array as argument
 		std::stringstream ss(Text);
 		T result;
diff --git a/extern/sdl4ogre/sdlinputwrapper.hpp b/extern/sdl4ogre/sdlinputwrapper.hpp
index e4c97066dc..2757018146 100644
--- a/extern/sdl4ogre/sdlinputwrapper.hpp
+++ b/extern/sdl4ogre/sdlinputwrapper.hpp
@@ -1,10 +1,7 @@
 #ifndef SDL4OGRE_SDLINPUTWRAPPER_H
 #define SDL4OGRE_SDLINPUTWRAPPER_H
 
-#if defined(_WIN32) && _MSC_VER >= 1800
-#include <algorithm>
 #define NOMINMAX
-#endif
 
 #include <SDL_events.h>