Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MacOSX doesn't like global szDebug and g_mutex symbol names

Browse Source
This commit is contained in:
Chris Robinson
2007-12-19 14:14:26 -08:00
parent d14ea2965d
commit 44df5c3567
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/ALc.c
+4 -4
View File
@@ -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);
}
OpenAL32/Include/alMain.h
+5 -5
View File
@@ -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)
OpenAL32/OpenAL32.c
+3 -3
View File
@@ -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