From 42402976e3a247ca70b87a806c26777d646f0cef Mon Sep 17 00:00:00 2001
From: Allofich <rickywd@gmail.com>
Date: Tue, 13 Jun 2017 18:55:22 +0900
Subject: [PATCH] Fixes for building in MSVC

---
 apps/openmw/mwgui/containeritemmodel.cpp   | 2 ++
 apps/openmw/mwscript/skyextensions.cpp     | 2 ++
 apps/openmw/mwsound/ffmpeg_decoder.cpp     | 1 +
 apps/openmw/mwsound/loudness.cpp           | 1 +
 apps/openmw/mwsound/sound.hpp              | 2 ++
 apps/openmw/mwstate/charactermanager.cpp   | 2 +-
 components/files/constrainedfilestream.cpp | 1 +
 components/sceneutil/controller.cpp        | 2 ++
 8 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/containeritemmodel.cpp b/apps/openmw/mwgui/containeritemmodel.cpp
index 1e4749695..d62cd16b0 100644
--- a/apps/openmw/mwgui/containeritemmodel.cpp
+++ b/apps/openmw/mwgui/containeritemmodel.cpp
@@ -1,5 +1,7 @@
 #include "containeritemmodel.hpp"
 
+#include <algorithm>
+
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
 
diff --git a/apps/openmw/mwscript/skyextensions.cpp b/apps/openmw/mwscript/skyextensions.cpp
index e0fccd16d..479c9d70c 100644
--- a/apps/openmw/mwscript/skyextensions.cpp
+++ b/apps/openmw/mwscript/skyextensions.cpp
@@ -1,5 +1,7 @@
 #include "skyextensions.hpp"
 
+#include <algorithm>
+
 #include <components/compiler/extensions.hpp>
 #include <components/compiler/opcodes.hpp>
 
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index c0a2014b3..1f1834761 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -4,6 +4,7 @@
 
 #include <stdexcept>
 #include <sstream>
+#include <algorithm>
 
 #include <components/vfs/manager.hpp>
 
diff --git a/apps/openmw/mwsound/loudness.cpp b/apps/openmw/mwsound/loudness.cpp
index 19e5cd586..ae31d6094 100644
--- a/apps/openmw/mwsound/loudness.cpp
+++ b/apps/openmw/mwsound/loudness.cpp
@@ -2,6 +2,7 @@
 
 #include <stdint.h>
 #include <limits>
+#include <algorithm>
 
 #include "soundmanagerimp.hpp"
 
diff --git a/apps/openmw/mwsound/sound.hpp b/apps/openmw/mwsound/sound.hpp
index a59027fc1..8c663fb1e 100644
--- a/apps/openmw/mwsound/sound.hpp
+++ b/apps/openmw/mwsound/sound.hpp
@@ -1,6 +1,8 @@
 #ifndef GAME_SOUND_SOUND_H
 #define GAME_SOUND_SOUND_H
 
+#include <algorithm>
+
 #include "sound_output.hpp"
 
 namespace MWSound
diff --git a/apps/openmw/mwstate/charactermanager.cpp b/apps/openmw/mwstate/charactermanager.cpp
index 62ddd649a..a91bd4e8c 100644
--- a/apps/openmw/mwstate/charactermanager.cpp
+++ b/apps/openmw/mwstate/charactermanager.cpp
@@ -58,7 +58,7 @@ MWState::Character* MWState::CharacterManager::createCharacter(const std::string
     // The character name is user-supplied, so we need to escape the path
     for (std::string::const_iterator it = name.begin(); it != name.end(); ++it)
     {
-        if (std::isalnum(*it)) // Ignores multibyte characters and non alphanumeric characters
+        if (isalnum(*it)) // Ignores multibyte characters and non alphanumeric characters
             stream << *it;
         else
             stream << "_";
diff --git a/components/files/constrainedfilestream.cpp b/components/files/constrainedfilestream.cpp
index cd9a3c8f5..4f76139d9 100644
--- a/components/files/constrainedfilestream.cpp
+++ b/components/files/constrainedfilestream.cpp
@@ -1,6 +1,7 @@
 #include "constrainedfilestream.hpp"
 
 #include <streambuf>
+#include <algorithm>
 
 #include "lowlevelfile.hpp"
 
diff --git a/components/sceneutil/controller.cpp b/components/sceneutil/controller.cpp
index ee2715650..8fef00333 100644
--- a/components/sceneutil/controller.cpp
+++ b/components/sceneutil/controller.cpp
@@ -1,5 +1,7 @@
 #include "controller.hpp"
 
+#include <algorithm>
+
 #include "statesetupdater.hpp"
 
 #include <osg/Drawable>