diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-09-09 12:43:10 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-09-09 12:43:10 -0700 |
| commit | 2df58f775fdd1c846ec125a9736d6dd39dab2811 (patch) | |
| tree | cbf35ab02a6b22bf76fcf436d75243df906acbcc /indra/media_plugins/webkit/mac_volume_catcher.cpp | |
| parent | 38b1975b09c642682bfeb8d6d575ccfbf47ce7e4 (diff) | |
| parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) | |
Merge viewer-release 3.6.6
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 |