Merge pull request #35 from Gawaboumga/POSIX
Fixed POSIX mutexes being not recursive + minor fixes Former-commit-id: ecd3fb06ec6e53f1cfd237b3d0a860cf88978c03
This commit is contained in:
@@ -235,6 +235,7 @@ void NzMemoryManager::Initialize()
|
||||
|
||||
#ifdef NAZARA_PLATFORM_WINDOWS
|
||||
InitializeCriticalSection(&s_mutex);
|
||||
//#elif defined(NAZARA_PLATFORM_POSIX) is already done in the namespace
|
||||
#endif
|
||||
|
||||
s_initialized = true;
|
||||
@@ -250,6 +251,8 @@ void NzMemoryManager::Uninitialize()
|
||||
{
|
||||
#ifdef NAZARA_PLATFORM_WINDOWS
|
||||
DeleteCriticalSection(&s_mutex);
|
||||
#elif defined(NAZARA_PLATFORM_POSIX)
|
||||
pthread_mutex_destroy(&s_mutex);
|
||||
#endif
|
||||
|
||||
FILE* log = std::fopen(s_logFileName, "a");
|
||||
|
||||
Reference in New Issue
Block a user