diff options
| author | Don Kjer <don@lindenlab.com> | 2013-09-10 14:59:33 -0700 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2013-09-10 14:59:33 -0700 |
| commit | 683c36ae2f81bd08d83d7e37c60f447196635834 (patch) | |
| tree | 05c60ca16e66a297a9ec19f0dc64c3f7664edcf0 /indra/media_plugins/webkit/mac_volume_catcher.cpp | |
| parent | 3a44c5c2a3e04ed8e7174bedb5753d29e6581019 (diff) | |
| parent | e6a68e1f09e4d056b4932111e09c3bff98acf29d (diff) | |
Automated merge
Diffstat (limited to 'indra/media_plugins/webkit/mac_volume_catcher.cpp')
| -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 |