diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:23:27 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-01 09:23:27 -0400 |
| commit | 8bc829220f8fc99180a1b1917220576a59de7339 (patch) | |
| tree | 626ee852038ef0729fe86e521f3719f94c94ce44 /indra/llaudio/llaudiodecodemgr.cpp | |
| parent | ed2222be5d33cb4216e6826507ae1d06e9781253 (diff) | |
| parent | 635a4524fafe754f38432fce2206f8c730df5234 (diff) | |
merge changes for storm-399
Diffstat (limited to 'indra/llaudio/llaudiodecodemgr.cpp')
| -rw-r--r-- | indra/llaudio/llaudiodecodemgr.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp index 01dfd03c18..f0b44f97d2 100644 --- a/indra/llaudio/llaudiodecodemgr.cpp +++ b/indra/llaudio/llaudiodecodemgr.cpp @@ -680,4 +680,10 @@ BOOL LLAudioDecodeMgr::addDecodeRequest(const LLUUID &uuid) return FALSE; } - +#if LL_DARWIN || LL_LINUX +// HACK: to fool the compiler into not emitting unused warnings. +namespace { + const ov_callbacks callback_array[4] = {OV_CALLBACKS_DEFAULT, OV_CALLBACKS_NOCLOSE, OV_CALLBACKS_STREAMONLY, + OV_CALLBACKS_STREAMONLY_NOCLOSE}; +} +#endif |