From 13af54171f2f809015560db88a55252c28c9ab85 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 10 Oct 2020 16:20:05 +0800 Subject: [PATCH] For #1780, build fail on ubuntu:focal. 3.0.144 --- trunk/src/core/srs_core.hpp | 2 +- trunk/src/kernel/srs_kernel_utility.cpp | 2 +- trunk/src/protocol/srs_protocol_utility.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 9a60cb8c5..fb6699fe5 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -48,7 +48,7 @@ // The current stable release. #define VERSION_STABLE 2 -#define VERSION_STABLE_BRANCH SRS_XSTR(VERSION_STABLE)".0release" +#define VERSION_STABLE_BRANCH SRS_XSTR(VERSION_STABLE) ".0release" // For 32bit os, 2G big file limit for unistd io, // ie. read/write/lseek to use 64bits size for huge file. diff --git a/trunk/src/kernel/srs_kernel_utility.cpp b/trunk/src/kernel/srs_kernel_utility.cpp index 1d91b72bd..fb9dd07ff 100644 --- a/trunk/src/kernel/srs_kernel_utility.cpp +++ b/trunk/src/kernel/srs_kernel_utility.cpp @@ -125,7 +125,7 @@ srs_utime_t srs_get_system_startup_time() // For utest to mock it. #ifndef SRS_AUTO_OSX -_srs_gettimeofday_t _srs_gettimeofday = ::gettimeofday; +_srs_gettimeofday_t _srs_gettimeofday = (_srs_gettimeofday_t)::gettimeofday; #endif srs_utime_t srs_update_system_time() diff --git a/trunk/src/protocol/srs_protocol_utility.cpp b/trunk/src/protocol/srs_protocol_utility.cpp index 2582a0c1a..57e65ecf0 100644 --- a/trunk/src/protocol/srs_protocol_utility.cpp +++ b/trunk/src/protocol/srs_protocol_utility.cpp @@ -122,7 +122,7 @@ void srs_discovery_tc_url(string tcUrl, string& schema, string& host, string& vh srs_vhost_resolve(vhost, stream, param); // Ignore when the param only contains the default vhost. - if (param == "?vhost="SRS_CONSTS_RTMP_DEFAULT_VHOST) { + if (param == "?vhost=" SRS_CONSTS_RTMP_DEFAULT_VHOST) { param = ""; } }