diff options
| author | simon_linden <none@none> | 2013-09-09 16:17:16 -0700 |
|---|---|---|
| committer | simon_linden <none@none> | 2013-09-09 16:17:16 -0700 |
| commit | e2019e8a3b5175eb6d7322fbe7c466f213854640 (patch) | |
| tree | 1e2fbeaeb249e0f3f0f91e94af213c1840438581 /indra/media_plugins/webkit | |
| parent | 6dd7e0c9ef587c6c05726d407bef8b51018a7a4b (diff) | |
| parent | 2c1d89c57ec21e4790eb14066d2291282a1000b4 (diff) | |
Merge downstream code with viewer-release
Diffstat (limited to 'indra/media_plugins/webkit')
| -rwxr-xr-x | indra/media_plugins/webkit/mac_volume_catcher.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/media_plugins/webkit/mac_volume_catcher.cpp b/indra/media_plugins/webkit/mac_volume_catcher.cpp index 8a06bb8487..cc94556413 100755 --- a/indra/media_plugins/webkit/mac_volume_catcher.cpp +++ b/indra/media_plugins/webkit/mac_volume_catcher.cpp @@ -35,10 +35,13 @@ #include "volume_catcher.h" -#include <Carbon/Carbon.h> #include <QuickTime/QuickTime.h> #include <AudioUnit/AudioUnit.h> +#if LL_DARWIN +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + struct VolumeCatcherStorage; class VolumeCatcherImpl @@ -266,3 +269,6 @@ void VolumeCatcher::pump() // No periodic tasks are necessary for this implementation. } +#if LL_DARWIN +#pragma GCC diagnostic warning "-Wdeprecated-declarations" +#endif |