diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-09-10 20:17:43 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2013-09-10 20:17:43 +0300 |
| commit | 8a0b7eaaddf9170db5f205d94f680915da13239c (patch) | |
| tree | 7b2028fa1bbb4fa64adcc4a1298952465cd87539 /indra/media_plugins/webkit/mac_volume_catcher.cpp | |
| parent | d995782edf1a55c327ad3f3349bd9d4b6ec3d9e6 (diff) | |
| parent | e2019e8a3b5175eb6d7322fbe7c466f213854640 (diff) | |
Merge for MAINT-3117
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 |