Remove #ifdef guards.

11 years ago · fd758bacd3
parent 76bf774485
commit fd758bacd3
2 changed files with 2 additions and 8 deletions
--- 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"

--- 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>