MapleShrine
/
mkxp
1
0
Fork 0
Code Issues 32 Pull Requests 11 Projects Releases Wiki Activity

Add some general fixes from #111 found by @chosenofbear

This commit is contained in:
Jonas Kulla 2015-06-18 07:21:55 +02:00
parent e778dc17c5
commit 2d31d08fa6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sdl-util.h
View File

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

1
src/vorbissource.cpp
View File

@ -25,6 +25,7 @@
#define OV_EXCLUDE_STATIC_CALLBACKS #define OV_EXCLUDE_STATIC_CALLBACKS
#include <vorbis/vorbisfile.h> #include <vorbis/vorbisfile.h>
#include <vector> #include <vector>
#include <algorithm>
static size_t vfRead(void *ptr, size_t size, size_t nmemb, void *ops) static size_t vfRead(void *ptr, size_t size, size_t nmemb, void *ops)
{ {