Merge branch 'master' into efx-experiment

1 files changed, 4 insertions, 4 deletions

diff --git a/Alc/ALc.c b/Alc/ALc.c
index aba408f4..8c824a2d 100644
--- a/Alc/ALc.c
+++ b/Alc/ALc.c
@@ -34,7 +34,7 @@
 ///////////////////////////////////////////////////////
 // DEBUG INFORMATION
 
-char szDebug[256];
+char _alDebug[256];
 
 ///////////////////////////////////////////////////////
 
@@ -206,7 +206,7 @@ static void InitAL(void)
         int i;
         const char *devs;
 
-        InitializeCriticalSection(&g_mutex);
+        InitializeCriticalSection(&_alMutex);
         ALTHUNK_INIT();
         ReadALConfig();
 
@@ -316,7 +316,7 @@ ALCvoid SetALCError(ALenum errorCode)
 ALCvoid SuspendContext(ALCcontext *pContext)
 {
     (void)pContext;
-    EnterCriticalSection(&g_mutex);
+    EnterCriticalSection(&_alMutex);
 }
 
 
@@ -328,7 +328,7 @@ ALCvoid SuspendContext(ALCcontext *pContext)
 ALCvoid ProcessContext(ALCcontext *pContext)
 {
     (void)pContext;
-    LeaveCriticalSection(&g_mutex);
+    LeaveCriticalSection(&_alMutex);
 }