Merge branch 'master' into dev-fix-group-ut-findings-closeflag

Haivision · Dec 19, 2024 · 83fcba8 · 83fcba8
2 parents d92e942 + 1ec61fc
commit 83fcba8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/srtcore/congctl.cpp b/srtcore/congctl.cpp
@@ -60,7 +60,7 @@ void SrtCongestion::Check()
 
 class LiveCC: public SrtCongestionControlBase
 {
-    int64_t  m_llSndMaxBW;          //Max bandwidth (bytes/sec)
+    srt::sync::atomic<int64_t>  m_llSndMaxBW;          //Max bandwidth (bytes/sec)
     srt::sync::atomic<size_t>   m_zSndAvgPayloadSize;  //Average Payload Size of packets to xmit
     size_t   m_zMaxPayloadSize;
     size_t   m_zHeaderSize;

diff --git a/srtcore/platform_sys.h b/srtcore/platform_sys.h
@@ -68,7 +68,9 @@
 // also other macros, like TARGET_OS_IOS etc.
 
 #include "TargetConditionals.h"
+#ifndef __APPLE_USE_RFC_3542
 #define __APPLE_USE_RFC_3542 /* IPV6_PKTINFO */
+#endif
 
 #ifdef SRT_IMPORT_TIME
       #include <mach/mach_time.h>