Merge branch 'Ancurio/master'

src/sdl-util.h

@@ -44,11 +44,7 @@ int __sdlThreadFun(void *obj)
 template<class C, void (C::*func)()>
 SDL_Thread *createSDLThread(C *obj, const std::string &name = std::string())
 {
-#ifdef _MSC_VER
 	return SDL_CreateThread((__sdlThreadFun<C, func>), name.c_str(), obj);
-#else
-	return SDL_CreateThread(__sdlThreadFun<C, func>, name.c_str(), obj);
-#endif
 }
 
 /* On Android, SDL_RWFromFile always opens files from inside

src/vorbissource.cpp

@@ -19,15 +19,13 @@
 ** along with mkxp.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifdef _MSC_VER
-#include <algorithm>
-#endif
 #include "aldatasource.h"
 #include "exception.h"
 
 #define OV_EXCLUDE_STATIC_CALLBACKS
 #include <vorbis/vorbisfile.h>
 #include <vector>
+#include <algorithm>
 
 static size_t vfRead(void *ptr, size_t size, size_t nmemb, void *ops)
 {