diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-09-09 14:51:34 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-09-09 14:51:34 -0400 |
| commit | c4b070ae0011a0c2aa8dd3d01c5f3ad3ecbd3ec3 (patch) | |
| tree | d9da12a63dad133b557ff14972844e21dee8dc34 /indra/media_plugins/webkit/mac_volume_catcher.cpp | |
| parent | 8dc273b942ca3bae7469dcbaf7bab171b889eea1 (diff) | |
| parent | 55ae6a7962cdc9a9d7d087fbc529d30db9c37013 (diff) | |
merge changes for 3.6.5-release
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 |