diff options
| -rw-r--r-- | Alc/ALc.c | 8 | ||||
| -rw-r--r-- | OpenAL32/Include/alMain.h | 10 | ||||
| -rw-r--r-- | OpenAL32/OpenAL32.c | 6 |
3 files changed, 12 insertions, 12 deletions
@@ -33,7 +33,7 @@ /////////////////////////////////////////////////////// // DEBUG INFORMATION -char szDebug[256]; +char _alDebug[256]; /////////////////////////////////////////////////////// @@ -193,7 +193,7 @@ static void InitAL(void) int i; const char *devs; - InitializeCriticalSection(&g_mutex); + InitializeCriticalSection(&_alMutex); ALTHUNK_INIT(); ReadALConfig(); @@ -303,7 +303,7 @@ ALCvoid SetALCError(ALenum errorCode) ALCvoid SuspendContext(ALCcontext *pContext) { (void)pContext; - EnterCriticalSection(&g_mutex); + EnterCriticalSection(&_alMutex); } @@ -315,7 +315,7 @@ ALCvoid SuspendContext(ALCcontext *pContext) ALCvoid ProcessContext(ALCcontext *pContext) { (void)pContext; - LeaveCriticalSection(&g_mutex); + LeaveCriticalSection(&_alMutex); } diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 8ffda560..71e29e47 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -72,18 +72,18 @@ extern "C" { #endif -extern CRITICAL_SECTION g_mutex; +extern CRITICAL_SECTION _alMutex; -extern char szDebug[256]; +extern char _alDebug[256]; #define AL_PRINT(...) do { \ int _al_print_i; \ char *_al_print_fn = strrchr(__FILE__, '/'); \ if(!_al_print_fn) _al_print_fn = __FILE__; \ else _al_print_fn += 1; \ - _al_print_i = snprintf(szDebug, sizeof(szDebug), "AL lib: %s:%d: ", _al_print_fn, __LINE__); \ - snprintf(szDebug+_al_print_i, sizeof(szDebug)-_al_print_i, __VA_ARGS__); \ - fprintf(stderr, "%s", szDebug); \ + _al_print_i = snprintf(_alDebug, sizeof(_alDebug), "AL lib: %s:%d: ", _al_print_fn, __LINE__); \ + snprintf(_alDebug+_al_print_i, sizeof(_alDebug)-_al_print_i, __VA_ARGS__); \ + fprintf(stderr, "%s", _alDebug); \ } while(0) diff --git a/OpenAL32/OpenAL32.c b/OpenAL32/OpenAL32.c index b638d945..678888b0 100644 --- a/OpenAL32/OpenAL32.c +++ b/OpenAL32/OpenAL32.c @@ -22,7 +22,7 @@ #include "alBuffer.h" #include "alThunk.h" -CRITICAL_SECTION g_mutex; +CRITICAL_SECTION _alMutex; #ifdef _WIN32 BOOL APIENTRY DllMain(HANDLE hModule,DWORD ul_reason_for_call,LPVOID lpReserved) @@ -40,7 +40,7 @@ BOOL APIENTRY DllMain(HANDLE hModule,DWORD ul_reason_for_call,LPVOID lpReserved) ReleaseALBuffers(); FreeALConfig(); ALTHUNK_EXIT(); - DeleteCriticalSection(&g_mutex); + DeleteCriticalSection(&_alMutex); break; } return TRUE; @@ -57,7 +57,7 @@ static void my_deinit() ReleaseALBuffers(); FreeALConfig(); ALTHUNK_EXIT(); - DeleteCriticalSection(&g_mutex); + DeleteCriticalSection(&_alMutex); } #endif #endif |