diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-12-23 17:50:20 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-12-23 18:30:40 +0800 |
| commit | b1d3b65094ddd1df5d458149b0000c67d86100c0 (patch) | |
| tree | e11a776c168076fcc42dd999e020231083ba0f03 /indra/llaudio | |
| parent | b26441798c26a7b0fc6b1eb3e88cecb19ecfbfe9 (diff) | |
MacPorts' openal-soft has been upgraded to 1.24.1
The __APPLE__ undef and redefining is for getting around the
`expected ';' after top level declarator`
error that would happen on /opt/local/include/AL/alext.h line 165:
typedef ALCboolean (ALC_APIENTRY*PFNALCSETTHREADCONTEXTPROC)(ALCcontext *context) ALC_API_NOEXCEPT17;
where ALCcontext wouldn't be recognised because of freealut's
/opt/local/include/AL/alut.h that would include macOS' OpenAL
framework alc.h instead of MacPorts openal-soft's own alc.h, if
__APPLE__ is defined, hence the undefining just before including
freealut's alut.h (and redefining afterwards, to avoid any problem).
Diffstat (limited to 'indra/llaudio')
| -rw-r--r-- | indra/llaudio/lllistener_openal.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llaudio/lllistener_openal.h b/indra/llaudio/lllistener_openal.h index f1b69ddcef..e4d7e67422 100644 --- a/indra/llaudio/lllistener_openal.h +++ b/indra/llaudio/lllistener_openal.h @@ -31,7 +31,11 @@ #include "lllistener.h" #include "AL/al.h" +#ifdef __APPLE__ +#undef __APPLE__ #include "AL/alut.h" +#define __APPLE__ +#endif #include "AL/alext.h" class LLListener_OpenAL : public LLListener |