[core] Minor: file scope for global var and func (#1938)

1. sync_posix: make global variable and function file scope 2. replace static_assert by SRT_STATIC_ASSERT
Haivision · Apr 14, 2021 · 109f667 · 109f667
1 parent 9e6c90f
commit 109f667
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/srtcore/core.cpp b/srtcore/core.cpp
@@ -2027,9 +2027,7 @@ int CUDT::processSrtMsg_HSREQ(const uint32_t *srtdata, size_t bytelen, uint32_t
         return SRT_CMD_REJECT;
     }
 
-#if HAVE_CXX11
-    static_assert(SRT_HS_E_SIZE == SRT_HS_LATENCY + 1, "Assuming latency is the last field");
-#endif
+    SRT_STATIC_ASSERT(SRT_HS_E_SIZE == SRT_HS_LATENCY + 1, "Assuming latency is the last field");
     if (bytelen < (SRT_HS_E_SIZE * sizeof(uint32_t)))
     {
         // Handshake extension message includes VERSION, FLAGS and LATENCY

diff --git a/srtcore/sync_posix.cpp b/srtcore/sync_posix.cpp
@@ -77,7 +77,7 @@ void rdtsc(uint64_t& x)
 #endif
 }
 
-int64_t get_cpu_frequency()
+static int64_t get_cpu_frequency()
 {
     int64_t frequency = 1; // 1 tick per microsecond.
 
@@ -123,9 +123,9 @@ static int count_subsecond_precision(int64_t ticks_per_us)
     return signs;
 }
 
-const int64_t s_clock_ticks_per_us = get_cpu_frequency();
+static const int64_t s_clock_ticks_per_us = get_cpu_frequency();
 
-const int s_clock_subsecond_precision = count_subsecond_precision(s_clock_ticks_per_us);
+static const int s_clock_subsecond_precision = count_subsecond_precision(s_clock_ticks_per_us);
 
 int clockSubsecondPrecision() { return s_clock_subsecond_precision; }