diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-07-29 14:32:37 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-29 14:32:37 +0300 |
| commit | 2ee039c736f64c91bb4f16e403360cddb0089707 (patch) | |
| tree | e565fac793bebb6d97fb6f2ec35bc484615a749f /indra/llwebrtc | |
| parent | e687250b90e63e71c9115ed97c3efd60ceefbcb6 (diff) | |
| parent | 3e322df4fb71cbeff27aab85bb48c7da595b548c (diff) | |
Merge branch 'develop' into marchcat/b-develop
Diffstat (limited to 'indra/llwebrtc')
| -rw-r--r-- | indra/llwebrtc/llwebrtc_impl.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llwebrtc/llwebrtc_impl.h b/indra/llwebrtc/llwebrtc_impl.h index 2fb5525519..c1acd77275 100644 --- a/indra/llwebrtc/llwebrtc_impl.h +++ b/indra/llwebrtc/llwebrtc_impl.h @@ -41,6 +41,7 @@ #include "llwebrtc.h" // WebRTC Includes #ifdef WEBRTC_WIN +#pragma warning(push) #pragma warning(disable : 4996) // ignore 'deprecated.' We don't use the functions marked // deprecated in the webrtc headers, but msvc complains anyway. // Clang doesn't, and that's generally what webrtc uses. @@ -63,7 +64,6 @@ #include "api/task_queue/default_task_queue_factory.h" #include "modules/audio_device/include/audio_device_defines.h" - namespace llwebrtc { @@ -379,4 +379,8 @@ class LLWebRTCPeerConnectionImpl : public LLWebRTCPeerConnectionInterface, } +#if WEBRTC_WIN +#pragma warning(pop) +#endif + #endif // LLWEBRTC_IMPL_H |