From bbdbcf173cbe983817424782d8dcd4ad96f64c70 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 26 Feb 2020 09:06:53 +0800 Subject: [PATCH] For #1615, refactor the version and API for SRT. --- trunk/src/srt/srt_server.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/trunk/src/srt/srt_server.cpp b/trunk/src/srt/srt_server.cpp index eb41866e0..7576d3bf5 100644 --- a/trunk/src/srt/srt_server.cpp +++ b/trunk/src/srt/srt_server.cpp @@ -257,8 +257,9 @@ void srt_server::on_work() } } - // @see 2020-01-28 https://github.com/Haivision/srt/commit/b8c70ec801a56bea151ecce9c09c4ebb720c2f68#diff-fb66028e8746fea578788532533a296bR786 -#if SRT_VERSION_MAJOR > 1 || SRT_VERSION_MINOR > 4 || SRT_VERSION_PATCH > 1 + // New API at 2020-01-28, >1.4.1 + // @see https://github.com/Haivision/srt/commit/b8c70ec801a56bea151ecce9c09c4ebb720c2f68#diff-fb66028e8746fea578788532533a296bR786 +#if (SRT_VERSION_MAJOR<<24 | SRT_VERSION_MINOR<<16 | SRT_VERSION_PATCH<<8) > 0x01040100 srt_epoll_clear_usocks(_pollid); #endif }