diff options
| author | Chris Robinson <[email protected]> | 2007-12-20 21:48:17 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2007-12-20 21:48:17 -0800 |
| commit | 229bc0d7e14f2671b420ea995101fc38523285d2 (patch) | |
| tree | 0217bc2b4fc04ae0fb445b6bc456b52745396737 /OpenAL32 | |
| parent | 7bf9ebf5450840c20d2453fcf7fc1f1b37f979ec (diff) | |
| parent | 5b0514a829afcdca201096f8f1c38ab684d45b49 (diff) | |
Merge branch 'master' into efx-experiment
Diffstat (limited to 'OpenAL32')
| -rw-r--r-- | OpenAL32/Include/alMain.h | 10 | ||||
| -rw-r--r-- | OpenAL32/OpenAL32.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 5a221065..168991b7 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 f79ddc0c..8510c7cb 100644 --- a/OpenAL32/OpenAL32.c +++ b/OpenAL32/OpenAL32.c @@ -25,7 +25,7 @@ #include "alAuxEffectSlot.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) @@ -43,7 +43,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; @@ -63,7 +63,7 @@ static void my_deinit() ReleaseALFilters(); FreeALConfig(); ALTHUNK_EXIT(); - DeleteCriticalSection(&g_mutex); + DeleteCriticalSection(&_alMutex); } #endif #endif |