external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into feature/rtc

Browse source
This commit is contained in:
winlin 2020-10-10 17:56:05 +08:00
commit b602aef56f
5 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/src/kernel/srs_kernel_utility.cpp
View file

@ -125,7 +125,7 @@ srs_utime_t srs_get_system_startup_time()
// For utest to mock it.
#ifndef SRS_OSX
_srs_gettimeofday_t _srs_gettimeofday = ::gettimeofday;
_srs_gettimeofday_t _srs_gettimeofday = (_srs_gettimeofday_t)::gettimeofday;
#endif
srs_utime_t srs_update_system_time()